Added support for 64bit build targets