Makefile + syntax fixes