Fixes

Some fixes for the PR in #44.

Good stuff!