Minor upgrades to various components

Just for alignment