Registry: Misc tweaks