common.mk edits