Small robustness fixes