Fixing some plugin errors