A few minor fixes, related to issue #3

Fixes #3