Robustness improvements: