Serenity concurrency

Made a few fixes from some errors I encountered while working on StoryTeller tests using FT.