Minor polish of metadata