Fix ComRegistry singleton