Minor bugfixes

Fixes #7