Revert x64 compiler update and add minor tweaks