Fixes in env