Registry fixes

More fixes. Halfway through fixing all of them now but Jesus I have no
idea why nobody brought up these issues before. How did people fork this
pile of garbage before? (Still broken btw)