Further bugfixes from last release.

Calguy added a new field to integrate with Cataloger.