More stability enhancements