makefile template fixes