\Environment fixes