Makefile: Some more fixs