more env fixes