Fix implicit 64/32 bit conversions