Couple of fixes

The distribution still needs some work, but this is progress worth committing.