Fixed launcher issues related to host instance refactor
Merge pull request #144 from nhr/launcher_fixes

Fixed launcher issues related to host instance refactor