more registration fixes