Adjustments for building with GCC and on 64-bit