Some env cleanups