Environment fixes