Slight robustness improvements