Update CommonMakefiles