A couple fixes and minor changes before 0.2a release.