More minor fixes to environments