Fix references to Customer fields