Fixes for offline mode