Fixed for Release
More Release Fixes