Fixes

As reported by @ncla in #27