Random robustness fixes that I need for whatever reasons.