* Fix support for 64 bit architectures

