Add some offline_mode checks missing