[COMMON] Align Makefile with last changes