Registration tweaks