Fixing registration helpers.