Scanner fixes. More to come!