Fix D7 export, add field instances, and fix field types