More fixes with launching while offline.

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>