Fixing scripts for new dev environment