Bug fixes in plugin side.