Fixed minor import/export bugs