Add a few more fields to the export and fix a few 2.0 compatibility issu...

...es.