fixes for 64 bit build