Fixes a few issues in the new registration process.