Some small fixes on the incoming data to customer.