Fixes for clean up