Use new plugins and (hopefully) fix CI