Some upgrades to plugins