Scanner fixes