Minor env changes.