code scanner bugfix, Makefile bugfix