+ fix issues on 64-bit Linux/MacOSX systems