Small changes in prepartion to the switch to using asyncio protocols