Fixed a few remaining issues with Hyperspace start/stop/check changes