More x64 bugs