Stability improvements.
