Fixed build and Makefile