Fixing some more Makefile issues.