Adjust for directory-common