Fixed a couple of problems with the plugins for bug #7702.