Some makefile changes and removing some compiler warnings