General stability improvements