I've been seeing a lot of issues with people getting soft-locked at sage toad, and I think an easy solution would be to have them and other similar units classed as "cowardly" or something (a bit like "minion" in StS), meaning that they run away if there are no non-cowardly units remaining.