Robustness improvements with uIP.