fixes in env setup