Fix up env settings