Many stability improvements