Few more updates for plugin bugs