Fix import/export issues