envs fix and build changes