Few component upgrades

Split in separate commits for clarity.