Robustness improvements.