Fix problems noted in gh-4.

Closes gh-4.