(Makefile.common) Fixes