Fix up some registration stuff