Some deps and plugin upgrades
Committing header fixes as per Lazlo request