robustness tweaks