Changes to make it boot again with the registration in the CC