Some minor robustness tweaks