Further stability improvements.