Fixed some import/export bugs