Fix some issues from f11b33f.

Resolves #180.