more x64 fixes