Fix issues with Makefile