Minor environment changes...