Small import/export fixes

branch badly named - I was trying to figure out what was going wrong in my other branch when I made it.