Pre-Release Bugfixes