further registration tweaks