Fix Makefile issues