fixes for 64-bit portability