Trivial fixes 12

A couple of trivial fixes before release 0.12.0