Small robustness improvements.