global robustness improvements