Fix Makefile issues.