Fixes

Just some minor fixes for things I found when working on the PR #26