More tweaks to harden the environment config