Fixups to new env scripts