Register tweaks