Robustness enhancements