Automatic registration bugfixes