FIXES for 64-bit build