Fixed incorrect plugin registration IDs, etc.