some more scan check fixes

...lots more to go....