Minor fixes

These two were blocker my my usage of puffing-billy, which I love to bits.

Unrelated to the PR, have a big thanks for making this, it's looking like it'll save me hours of rerunning test suites on dodgy internet connections!