Adding scanner fixes