Fix a couple issues with the 0.2 release

There is one annoyance and one breakage with the 0.2 release thus far that is unrelated to what we hope to do in 0.3. This PR accounts for that.