Updates

This PR mixes two fixes and two unrelated changes, though each commit is atomic and should be easy to review. I'm doing a single PR to ping some people just once, please take a look: @mislav (for the #22 fix), @gibson042 (for the #23 fix) and @scottgonzalez. Thanks!