Offline mode fixes
Merge branch 'master' of https://github.com/hanlonal/CSE4982013