If I may - I’d also be willing to redo the AI dialog that currently exists using Poe’s own dialog as its reference. It will blend in much better that way.
Also, did you decide against Leia giving Maz the lightsaber in Rey’s vision and telling her to keep it safe?