Small fixups.

Closes 48