Fix environments