Minor cleanup of metadata