Tweaked Makefile, fixed warnings