Minor fixes.

Note that this project primarily exists as part of cbcaves
now, but will likely be ported back once cbcaves is
stable enough to be modularized properly.