Fixes to Plugins