Stability improvements
Stability improvements