Incorporate some small fixes.

See #25.