Environment tweaks
minor bug fix
bugfix
Fix conditional error