fixes in env