* Some more Makefile fixes