Fix Plugins issues