Move a few things around in common.mk