Fixing up the registration importing issues