Fixing few bugs and making sure the new plugin works fine