A few changes to environment