A few minor fixes to make the scanner class compile
Update dependencies in Makefile