Fix up a few plugins to do the right thing