rosetta fixes and upgrades