fixes for cleanup interval