Fix issues found when testing script on local.
Fix issues found when testing script on local.

DoSomething/dosomething,mshmsh5000/dosomething-1,DoSomething/phoenix,deadlybutter/phoenix,DoSomething/phoenix,DoSomething/dosomething,DoSomething/phoenix,DoSomething/dosomething,deadlybutter/phoenix,deadlybutter/phoenix,deadlybutter/phoenix,mshmsh5000/dosomething-1,mshmsh5000/dosomething-1,DoSomething/phoenix,deadlybutter/phoenix,DoSomething/dosomething,DoSomething/dosomething,DoSomething/dosomething,mshmsh5000/dosomething-1,DoSomething/phoenix,mshmsh5000/dosomething-1