#3 Fix minor issues preparing for release

@jmthomas