Fix for plugin errors