fixes for 64 bit compile