fixes for Linux 64-bit build