Other fixes on plugin registration.