fix some 64-bit types