More stability improvements