Order payment fixes