[BasePlugin] Corrections and clean up