Improved support for 64bit targets.