Further environment tweaking.