Makefile updates and minor warnings fix