Fix some multi-value fields