Fixes for insurance payer