Several work, tweaks and fixes around the registration process.