Update the Makefile to allow scan-build
Simple problems found with scan-build
Work in progres, we seem to hit a problem but don't know what yet.