Add & fix some plugins