Cleanup and fix for release