Fixed up some data structure errors in drupal exporter;