Fixes for environs

What the title says