A few more fixes as we get close to the release of 6.2 final.