Fix some Makefile issues.