Lots of fixes to all the plugins