Minor upgrades to various components