some more changes for building for 64 bit