Plugin upgrades
Minor clean up