{READY} ~ More pre-release bug fixes.

Nothing major, just more pre-release bugfixes.