[PATCH 00/14] Some more env fixes