Check Scanner - Bug fixes and tweaks