Some more robustness fixes