Enhancements for stability