[PATCH] envctrl fixes