Env fixs