Fixes in various plugins.