more registration tweaks