Fix some errors with the public register functionality