So yes, that cleans up and things do happen in the right order on both routes now.
Thanks for your help!