Minor registration fixes