Config tweaks to work with /common/