@dave42 Would you mind having a look at these bits for me? I'm not sure what they are about, and whether we should be using their version rather than ours, or some combination...