Environmental fixes