More Release Fixes