Minor bug fixes. Fixes #108, fixes #110