Upgrade fixes and rerun support