Added borer checks to handheld and advanced scanners.