Fixed a few bugs in the scanner