Fix issues raised through TestSwarm