Backport preliminary cheat patches