Fix stuff that broke x64 build