Fixed small issues with common.mk