Fixes in Scanner