Better ENV enforcement