Make env setup correct