Fix Makefile errors