Fixes for server-side

Server no longer crashes while trying to spin up client instance.