Merge Ubuntu x64 compatibility