Fix broken ENV overrides