Incorporate @rsanc77's upgrade fixes