Fix bad relationship between payment/payment type entities.