Fix support for offline-mode (does offline-mode even work anymore?)