Fixes for x64 platforms