Fixed up some registration processes