diff --git a/composer.lock b/composer.lock
index 124a027..82931d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2198,16 +2198,16 @@
         },
         {
             "name": "joomla-projects/jorobo",
-            "version": "0.7.1",
+            "version": "0.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-projects/jorobo.git",
-                "reference": "ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52"
+                "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52",
-                "reference": "ebcbd0eae3b9f2dfcca35d86ba442c88c942bc52",
+                "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/9ed1190edab1e5f69286570e2ebdd451f6d15b01",
+                "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01",
                 "shasum": ""
             },
             "require": {
@@ -2244,7 +2244,7 @@
                 }
             ],
             "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases",
-            "time": "2019-08-12T18:25:30+00:00"
+            "time": "2019-08-16T16:56:45+00:00"
         },
         {
             "name": "joomla-projects/selenium-server-standalone",
@@ -2283,7 +2283,7 @@
                     "email": "sven.eisenschmidt@gmail.com"
                 },
                 {
-                    "name": "Javier Gómez",
+                    "name": "Javier Gomez",
                     "email": "javier.gomez@community.joomla.org"
                 }
             ],
diff --git a/src/administrator/components/com_weblinks/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml
index a708d40..5bebeb9 100644
--- a/src/administrator/components/com_weblinks/models/forms/weblink.xml
+++ b/src/administrator/components/com_weblinks/models/forms/weblink.xml
@@ -38,6 +38,7 @@
 			label="JCATEGORY"
 			description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
 			extension="com_weblinks"
+			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
 			required="true"
 			default=""
 		/>
diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php
index f81d4c0..0346630 100644
--- a/src/administrator/components/com_weblinks/tables/weblink.php
+++ b/src/administrator/components/com_weblinks/tables/weblink.php
@@ -38,8 +38,11 @@ class WeblinksTableWeblink extends JTable
 		// Set the published column alias
 		$this->setColumnAlias('published', 'state');
 
-		JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
-		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
+		if (version_compare(JVERSION, '4.0', '<' ) == 1)
+		{
+			JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
+			JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
+		}
 	}
 
 	/**
@@ -195,6 +198,6 @@ class WeblinksTableWeblink extends JTable
 			$this->metakey = implode(", ", $clean_keys);
 		}
 
-		return true;
+		return parent::check();
 	}
 }
diff --git a/src/administrator/components/com_weblinks/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php
index cc37c83..f97955f 100644
--- a/src/administrator/components/com_weblinks/views/weblinks/view.html.php
+++ b/src/administrator/components/com_weblinks/views/weblinks/view.html.php
@@ -93,7 +93,7 @@ class WeblinksViewWeblinks extends JViewLegacy
 		$user  = JFactory::getUser();
 
 		// Get the toolbar object instance
-		$bar = JToolBar::getInstance('toolbar');
+		$bar = JToolbar::getInstance('toolbar');
 
 		JToolbarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks');
 
@@ -129,7 +129,7 @@ class WeblinksViewWeblinks extends JViewLegacy
 		if ($user->authorise('core.create', 'com_weblinks') && $user->authorise('core.edit', 'com_weblinks')
 			&& $user->authorise('core.edit.state', 'com_weblinks'))
 		{
-			JHtml::_('bootstrap.modal', 'collapseModal');
+			JHtml::_('bootstrap.renderModal', 'collapseModal');
 			$title = JText::_('JTOOLBAR_BATCH');
 
 			// Instantiate a new JLayoutFile instance and render the batch button
diff --git a/src/plugins/finder/weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php
index 32de240..8dc5306 100644
--- a/src/plugins/finder/weblinks/weblinks.php
+++ b/src/plugins/finder/weblinks/weblinks.php
@@ -12,7 +12,7 @@ defined('JPATH_BASE') or die;
 use Joomla\Registry\Registry;
 
 // Load the base adapter.
-require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php';
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
 
 /**
  * Smart Search adapter for Joomla Web Links.