Upgraded some versions