More registration fixes