Various robustness tweaks
