More fixes to scanner & banner crawler