minor tweaks for environment