fix some types for 64-bit platforms