Stability fixes and upgrades. (v3.6.9)