I don’t know if it could be done but. In Return of the Jedi Han says to Luke “I owe you one” it would have worked better if he said “You still owe me one” as he saved Luke in the original Death Star attack and on the frozen wastes of Both. It would show that despite his gratitude for being saved he has retained his essential 'Han’ness, something sorely missed in this film.
It really just shows Han is really bad at math.