I've experienced these issues as well. Due to failing the scenario repeatedly I now have 4 wands of enervation (not complaining as I have both Ezren and Seoni in party); and after I cornered and defeated all three villains, the scenario still didn't end until I'd finished closing all the locations.