Misc makefile work
Some more
unused