Issue #80 - App crashes on startup and Issue #82 remote domain refactoring local fixes