Robustness Improvements