Minor adjustments to env configs. TRAD-33