Minor Environment adjustments