BugFix and Cleanup for release