Makefile rule fixes