Fixes for new env scripts