Fix some registration problems