Registry
Misc changes