Plugin removal fixes.