Fixes/upgrades versions