Fixing config registry issues and keymanager clustering