Robustness improvements