some registration fixes