Fixes for environs