Minor fixes.
Fixes #15