Minor fixes on plugin system project