More fixes made before the release of the new version.

Benjamin Mako Hill || Want to submit a patch?