Some environment changes