Further tweaks to env config