A few fixes. Keep original data after processing.