more env fixups