Env module updates

From @erictj :)