CoreRegistry fixes

No match.