Added plugin fixes by Neeru