Fixed a couple fp bugs in the scanner