Seems straightforward enough. I think the all-in on the river is fine, as the only thing that makes sense that they call with on the river is a flush, and that's insta-calling there anyways.