Fix some missed updates in envs