OK - fixing the 2 bugs has no effect on the existing tests, so I'll need to take more time later tonight, but should have a fix up