Fix some legacy format processing.