Fixes to the plugins