Fixed a few VM warnings, adjusted Makefile