Fix connection & registration (1)