Small stability improvements