Fix remaining 32-bit compile issues