(Mod) Makefile fixes