Fix connection/registration