Crashes from recent changes fixed on x86-64, including saves

Commit f668ee on the x86-64 beta: "Fix crashes related to recent changes, including saves".