Additional minor env updates