cleanEnv fixes