Some fixes for import/export, typos, etc.