minor robustness tweaks