migration: Fix remaining 32 bit compiler errors