Fix majority of env specs.