Fix makefiles
Random stuff, just to get a simple compile
More of the same