This commit includes a couple of registration bug fixes