more scanner fixes