fixes for cleanup