More environment config tuning