Environment tweaks