More version upgrades + fixes