Minor changes for creating env