Offer flow changes

Misc fixes