Resolved compiler warnings, minor Makefile edits