Minor stability improvements