Straighten out metadata