I was so very disappointed when Ms. Shape Shifter's demeanor didn't change at all when she was with the rest of her team. That was just a horrible acting choice.

That threw me as well. It might as well have been Chloe in that scene, and I found that really jarring. I had to be fair, though, and throw some blame the director's way, too, much as it pained me. :-) (I make no claims to be completely objective where TW is concerned. It's always an effort.)