Minor Makefile cleanup
Warning cleanup