Fixed launcher issues related to host instance refactor