Allow multiple registrations
Fix offline detection