Mod: Some changes to environment