Small env updates