Big stability improvements