2.6 version updates, minor updates