Some stability improvements