minor robustness upgrades to AutoSmurf()