Fixed for unix 64 bit systems
Changed for CMake system