Small Environment Tweaks

I might have handled the clashes wrong - let's see!