Minor environment changes ;)