diff --git a/artefact/annotation/blocktype/annotation/lib.php b/artefact/annotation/blocktype/annotation/lib.php
index 46c63792..8672109d 100644
--- a/artefact/annotation/blocktype/annotation/lib.php
+++ b/artefact/annotation/blocktype/annotation/lib.php
@@ -153,7 +153,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
 
         $instance->set('artefactplugin', 'annotation');
diff --git a/artefact/blog/blocktype/blog/lib.php b/artefact/blog/blocktype/blog/lib.php
index 4a91cd24..76e31568 100644
--- a/artefact/blog/blocktype/blog/lib.php
+++ b/artefact/blog/blocktype/blog/lib.php
@@ -128,7 +128,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         safe_require('artefact', 'blog');
         $configdata = $instance->get('configdata');
diff --git a/artefact/blog/blocktype/blogpost/lib.php b/artefact/blog/blocktype/blogpost/lib.php
index 73a28c06..64e5d55a 100644
--- a/artefact/blog/blocktype/blogpost/lib.php
+++ b/artefact/blog/blocktype/blogpost/lib.php
@@ -100,7 +100,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         safe_require('artefact', 'blog');
         $configdata = $instance->get('configdata');
diff --git a/artefact/blog/blocktype/recentposts/lib.php b/artefact/blog/blocktype/recentposts/lib.php
index d83692be..ee023586 100644
--- a/artefact/blog/blocktype/recentposts/lib.php
+++ b/artefact/blog/blocktype/recentposts/lib.php
@@ -163,7 +163,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         safe_require('artefact', 'blog');
         $configdata = $instance->get('configdata');
         $elements = array(self::artefactchooser_element((isset($configdata['artefactids'])) ? $configdata['artefactids'] : null),
diff --git a/artefact/blog/blocktype/taggedposts/lib.php b/artefact/blog/blocktype/taggedposts/lib.php
index 7bbbe5d3..0995b57c 100644
--- a/artefact/blog/blocktype/taggedposts/lib.php
+++ b/artefact/blog/blocktype/taggedposts/lib.php
@@ -354,7 +354,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         safe_require('artefact', 'blog');
         $configdata = $instance->get('configdata');
diff --git a/artefact/comment/lib.php b/artefact/comment/lib.php
index 197e16fe..d67fbec8 100644
--- a/artefact/comment/lib.php
+++ b/artefact/comment/lib.php
@@ -676,7 +676,7 @@ public static function last_public_comment($view=null, $artefact=null) {
             WHERE c.private = 0 AND c.hidden = 0 AND ' . $where . '
             ORDER BY a.ctime DESC', $values, 0, 1
         );
-        return $newest[0];
+        return is_array($newest) ? $newest[0] : null;
     }
 
     /**
diff --git a/artefact/file/blocktype/filedownload/lib.php b/artefact/file/blocktype/filedownload/lib.php
index 3dff93ee..cabdacf4 100644
--- a/artefact/file/blocktype/filedownload/lib.php
+++ b/artefact/file/blocktype/filedownload/lib.php
@@ -86,7 +86,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/folder/lib.php b/artefact/file/blocktype/folder/lib.php
index 8b8f36bf..a2691666 100644
--- a/artefact/file/blocktype/folder/lib.php
+++ b/artefact/file/blocktype/folder/lib.php
@@ -118,7 +118,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/gallery/lib.php b/artefact/file/blocktype/gallery/lib.php
index 276123d4..38c802e5 100644
--- a/artefact/file/blocktype/gallery/lib.php
+++ b/artefact/file/blocktype/gallery/lib.php
@@ -542,7 +542,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/html/lib.php b/artefact/file/blocktype/html/lib.php
index b91c8abf..5722dc38 100644
--- a/artefact/file/blocktype/html/lib.php
+++ b/artefact/file/blocktype/html/lib.php
@@ -64,7 +64,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/image/lib.php b/artefact/file/blocktype/image/lib.php
index 6f801bd0..ca29f867 100644
--- a/artefact/file/blocktype/image/lib.php
+++ b/artefact/file/blocktype/image/lib.php
@@ -82,7 +82,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/internalmedia/lib.php b/artefact/file/blocktype/internalmedia/lib.php
index 9893a30f..ab57e316 100644
--- a/artefact/file/blocktype/internalmedia/lib.php
+++ b/artefact/file/blocktype/internalmedia/lib.php
@@ -84,7 +84,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/file/blocktype/pdf/lib.php b/artefact/file/blocktype/pdf/lib.php
index e33c95c9..bcea6544 100644
--- a/artefact/file/blocktype/pdf/lib.php
+++ b/artefact/file/blocktype/pdf/lib.php
@@ -106,7 +106,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         safe_require('artefact', 'file');
         $instance->set('artefactplugin', 'file');
diff --git a/artefact/internal/blocktype/profileinfo/lib.php b/artefact/internal/blocktype/profileinfo/lib.php
index 89663a57..c2cb639e 100644
--- a/artefact/internal/blocktype/profileinfo/lib.php
+++ b/artefact/internal/blocktype/profileinfo/lib.php
@@ -172,7 +172,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         $form = array();
diff --git a/artefact/internal/blocktype/socialprofile/lib.php b/artefact/internal/blocktype/socialprofile/lib.php
index 37f0f41c..25e53269 100644
--- a/artefact/internal/blocktype/socialprofile/lib.php
+++ b/artefact/internal/blocktype/socialprofile/lib.php
@@ -84,7 +84,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         $owner = $instance->get_view()->get('owner');
         $form = array();
diff --git a/artefact/internal/blocktype/textbox/lib.php b/artefact/internal/blocktype/textbox/lib.php
index 1afad5e1..8bf6077b 100644
--- a/artefact/internal/blocktype/textbox/lib.php
+++ b/artefact/internal/blocktype/textbox/lib.php
@@ -322,7 +322,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         require_once('license.php');
         safe_require('artefact', 'file');
diff --git a/artefact/peerassessment/blocktype/peerassessment/lib.php b/artefact/peerassessment/blocktype/peerassessment/lib.php
index 79ead7d4..18421c70 100644
--- a/artefact/peerassessment/blocktype/peerassessment/lib.php
+++ b/artefact/peerassessment/blocktype/peerassessment/lib.php
@@ -101,7 +101,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         if (!$height = get_config('blockeditorheight')) {
             $cfheight = param_integer('cfheight', 0);
diff --git a/artefact/peerassessment/blocktype/signoff/lib.php b/artefact/peerassessment/blocktype/signoff/lib.php
index 50e57aed..5b4dedd8 100644
--- a/artefact/peerassessment/blocktype/signoff/lib.php
+++ b/artefact/peerassessment/blocktype/signoff/lib.php
@@ -94,7 +94,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         $elements = array (
             'signoff' => array (
diff --git a/artefact/plans/blocktype/plans/lib.php b/artefact/plans/blocktype/plans/lib.php
index d0eeeea5..8b5f2c0f 100644
--- a/artefact/plans/blocktype/plans/lib.php
+++ b/artefact/plans/blocktype/plans/lib.php
@@ -154,7 +154,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $instance->set('artefactplugin', 'plans');
         $configdata = $instance->get('configdata');
         $owner = $instance->get_view()->get('owner');
diff --git a/artefact/resume/blocktype/entireresume/lib.php b/artefact/resume/blocktype/entireresume/lib.php
index 23fda840..e8129533 100644
--- a/artefact/resume/blocktype/entireresume/lib.php
+++ b/artefact/resume/blocktype/entireresume/lib.php
@@ -64,7 +64,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $owner = $instance->get_view()->get('owner');
         if ($owner) {
             $elements = array(
diff --git a/artefact/resume/blocktype/resumefield/lib.php b/artefact/resume/blocktype/resumefield/lib.php
index 000ee64a..a0b5715c 100644
--- a/artefact/resume/blocktype/resumefield/lib.php
+++ b/artefact/resume/blocktype/resumefield/lib.php
@@ -76,7 +76,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         $form = array();
diff --git a/blocktype/creativecommons/lib.php b/blocktype/creativecommons/lib.php
index a85f21c2..a028b0cd 100644
--- a/blocktype/creativecommons/lib.php
+++ b/blocktype/creativecommons/lib.php
@@ -108,7 +108,7 @@ public static function instance_config_save($values) {
         return $values;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $THEME;
         $configdata = $instance->get('configdata');
         $noderivatives = 1;
diff --git a/blocktype/externalfeed/lib.php b/blocktype/externalfeed/lib.php
index 431eb75e..e913692d 100644
--- a/blocktype/externalfeed/lib.php
+++ b/blocktype/externalfeed/lib.php
@@ -136,7 +136,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         if (!empty($configdata['feedid'])) {
diff --git a/blocktype/externalvideo/lib.php b/blocktype/externalvideo/lib.php
index 68afccd5..eaf407c5 100644
--- a/blocktype/externalvideo/lib.php
+++ b/blocktype/externalvideo/lib.php
@@ -203,7 +203,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         return array(
diff --git a/blocktype/googleapps/lib.php b/blocktype/googleapps/lib.php
index 5a4c1763..7fcbe1e5 100644
--- a/blocktype/googleapps/lib.php
+++ b/blocktype/googleapps/lib.php
@@ -72,7 +72,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         return array(
diff --git a/blocktype/groupmembers/lib.php b/blocktype/groupmembers/lib.php
index 688e3112..d33e8b73 100644
--- a/blocktype/groupmembers/lib.php
+++ b/blocktype/groupmembers/lib.php
@@ -102,7 +102,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         $options = range(0,100);
diff --git a/blocktype/groupviews/lib.php b/blocktype/groupviews/lib.php
index aa593ad5..e991acac 100644
--- a/blocktype/groupviews/lib.php
+++ b/blocktype/groupviews/lib.php
@@ -196,7 +196,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         return array(
             'showgroupviews' => array(
diff --git a/blocktype/inbox/lib.php b/blocktype/inbox/lib.php
index cda2b044..42dec149 100644
--- a/blocktype/inbox/lib.php
+++ b/blocktype/inbox/lib.php
@@ -81,7 +81,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         $configdata = $instance->get('configdata');
 
diff --git a/blocktype/lib.php b/blocktype/lib.php
index 3cc9f1ba..c6a10def 100644
--- a/blocktype/lib.php
+++ b/blocktype/lib.php
@@ -372,7 +372,7 @@ public static function delete_instance(BlockInstance $instance) { }
     /**
     * This function must be implemented in the subclass if it has config
     */
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         throw new SystemException(get_string('blocktypemissingconfigform', 'error', $instance->get('blocktype')));
     }
 
diff --git a/blocktype/mygroups/lib.php b/blocktype/mygroups/lib.php
index 26b1e9fe..1accf0f8 100644
--- a/blocktype/mygroups/lib.php
+++ b/blocktype/mygroups/lib.php
@@ -119,7 +119,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         return array(
diff --git a/blocktype/navigation/lib.php b/blocktype/navigation/lib.php
index 5cbee9fe..eca5fe69 100644
--- a/blocktype/navigation/lib.php
+++ b/blocktype/navigation/lib.php
@@ -68,7 +68,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         $view = $instance->get_view();
diff --git a/blocktype/newviews/lib.php b/blocktype/newviews/lib.php
index 2dbda4a8..1fe3e6cc 100644
--- a/blocktype/newviews/lib.php
+++ b/blocktype/newviews/lib.php
@@ -63,7 +63,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         return array('limit' => array(
             'type' => 'text',
diff --git a/blocktype/openbadgedisplayer/lib.php b/blocktype/openbadgedisplayer/lib.php
index 0af2a1a3..ad260837 100644
--- a/blocktype/openbadgedisplayer/lib.php
+++ b/blocktype/openbadgedisplayer/lib.php
@@ -343,7 +343,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
         $owner = $instance->get_view()->get('owner');
         $sources = self::get_backpack_source();
diff --git a/blocktype/placeholder/lib.php b/blocktype/placeholder/lib.php
index 4675dba5..5578fee7 100644
--- a/blocktype/placeholder/lib.php
+++ b/blocktype/placeholder/lib.php
@@ -50,7 +50,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
 
         $view = $instance->get_view();
diff --git a/blocktype/recentforumposts/lib.php b/blocktype/recentforumposts/lib.php
index ac33ccfb..19d121e1 100644
--- a/blocktype/recentforumposts/lib.php
+++ b/blocktype/recentforumposts/lib.php
@@ -138,7 +138,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         global $USER;
 
         $elements   = array();
diff --git a/blocktype/text/lib.php b/blocktype/text/lib.php
index 4ad5e736..46efe8b5 100644
--- a/blocktype/text/lib.php
+++ b/blocktype/text/lib.php
@@ -60,7 +60,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         require_once('license.php');
         $configdata = $instance->get('configdata');
         if (!$height = get_config('blockeditorheight')) {
diff --git a/blocktype/watchlist/lib.php b/blocktype/watchlist/lib.php
index 536a0f6e..f4415cff 100644
--- a/blocktype/watchlist/lib.php
+++ b/blocktype/watchlist/lib.php
@@ -190,7 +190,7 @@ public static function get_instance_config_javascript(BlockInstance $instance) {
         return array('js/configform.js');
     }
 
-    public static function instance_config_form(BlockInstance $instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         $classes = 'first last';
         if (!isset($configdata) || (isset($configdata['mode']) && $configdata['mode'] == 'watchlist')) {
diff --git a/lib/form/elements/filebrowser.php b/lib/form/elements/filebrowser.php
index 055825b1..eb4667bd 100644
--- a/lib/form/elements/filebrowser.php
+++ b/lib/form/elements/filebrowser.php
@@ -74,7 +74,7 @@ function pieform_element_filebrowser(Pieform $form, $element) {
     $smarty->assign('folder', $folder);
     $smarty->assign('foldername', $path[0]->title);
     $smarty->assign('path', array_reverse($path));
-    $smarty->assign('highlight', $element['highlight'][0]);
+    $smarty->assign('highlight', is_array($element['highlight']) ? $element['highlight'][0]: null);
     $smarty->assign('edit', !empty($element['edit']) ? $element['edit'] : -1);
     if (isset($element['browse'])) {
         $smarty->assign('browse', (int) $element['browse']);
diff --git a/lib/version.php b/lib/version.php
index 38200fa3..3e758d24 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -16,8 +16,8 @@
 // See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
 // For upgrades on stable branches, increment the version by one.  On master, use the date.
 
-$config->version = 2019093025;
-$config->series = '19.10';
-$config->release = '19.10.6';
+$config->version = 2023100100;
+$config->series = '23.04';
+$config->release = '23.04.0';
 $config->minupgradefrom = 2017031605;
 $config->minupgraderelease = '17.04.0 (release tag 17.04.0_RELEASE)';
diff --git a/opt/europass/blocktype/europasscv/lib.php b/opt/europass/blocktype/europasscv/lib.php
index fa7a6c6a..a0ec9a46 100644
--- a/opt/europass/blocktype/europasscv/lib.php
+++ b/opt/europass/blocktype/europasscv/lib.php
@@ -59,7 +59,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form($instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         $locale = (isset($configdata['locale']) ? $configdata['locale'] : get_config('lang'));
         $profilepic = (isset($configdata['profilepic']) ? $configdata['profilepic'] : false);
diff --git a/opt/europass/blocktype/europassfield/lib.php b/opt/europass/blocktype/europassfield/lib.php
index 74594f31..f11d9660 100644
--- a/opt/europass/blocktype/europassfield/lib.php
+++ b/opt/europass/blocktype/europassfield/lib.php
@@ -112,7 +112,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form($instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         return array(
diff --git a/opt/europass/blocktype/europasslp/lib.php b/opt/europass/blocktype/europasslp/lib.php
index 03e379d0..4f0b138a 100644
--- a/opt/europass/blocktype/europasslp/lib.php
+++ b/opt/europass/blocktype/europasslp/lib.php
@@ -57,7 +57,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form($instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
         $locale = (isset($configdata['locale']) ? $configdata['locale'] : get_config('lang'));
 
diff --git a/opt/europass/blocktype/mylanguages/lib.php b/opt/europass/blocktype/mylanguages/lib.php
index 3039cab3..46dd8ac1 100644
--- a/opt/europass/blocktype/mylanguages/lib.php
+++ b/opt/europass/blocktype/mylanguages/lib.php
@@ -79,7 +79,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form($instance) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
         $configdata = $instance->get('configdata');
 
         return array(
diff --git a/opt/europass/languages.php b/opt/europass/languages.php
index b6670709..b83eaf9c 100644
--- a/opt/europass/languages.php
+++ b/opt/europass/languages.php
@@ -83,6 +83,7 @@
 
 // Delete mother tongue(s) form
 $elements = array();
+$mothertongue_data = is_array($mothertongue_data) ? $mothertongue_data : array();
 foreach ($mothertongue_data as $lang) {
     $elements[$lang->description] = array(
         'type' => 'checkbox',
diff --git a/opt/europass/lib.php b/opt/europass/lib.php
index 12d11cb7..99c1ae4f 100644
--- a/opt/europass/lib.php
+++ b/opt/europass/lib.php
@@ -157,7 +157,7 @@ public static function get_links($id) {
     /**
      * Default render method for Europass fields - show their description
      */
-    public function render_self() {
+    public function render_self($options) {
         return clean_html($this->get('description'));
     }
 
@@ -353,7 +353,7 @@ public static function get_form_elements() {
         );
     }
 
-    public static function bulk_delete($artefactids) {
+    public static function bulk_delete($artefactids, $log = false) {
         parent::bulk_delete_composite($artefactids, 'otherlanguage');
     }
 }
@@ -407,7 +407,7 @@ public static function get_form_elements() {
         );
     }
 
-    public static function bulk_delete($artefactids) {
+    public static function bulk_delete($artefactids, $log = false) {
         parent::bulk_delete_composite($artefactids, 'languagediploma');
     }
 }
@@ -447,7 +447,7 @@ public static function get_form_elements() {
         );
     }
 
-    public static function bulk_delete($artefactids) {
+    public static function bulk_delete($artefactids, $log = false) {
         parent::bulk_delete_composite($artefactids, 'languageexperience');
     }
 }
@@ -519,7 +519,7 @@ public static function get_form_elements() {
         );
     }
 
-    public static function bulk_delete($artefactids) {
+    public static function bulk_delete($artefactids, $log = false) {
         parent::bulk_delete_composite($artefactids, 'digitalcompetence');
     }
 }
@@ -573,7 +573,7 @@ public static function get_form_elements() {
         );
     }
 
-    public static function bulk_delete($artefactids) {
+    public static function bulk_delete($artefactids, $log = false) {
         parent::bulk_delete_composite($artefactids, 'digitaldiploma');
     }
 }
@@ -771,7 +771,7 @@ public static function populate_form(&$form, $id, $type) {
     /**
      * Render method for Driving licence(s) Europass field
      */
-    public function render_self() {
+    public function render_self($options) {
         $licences = unserialize($this->description);
         $renderhtml = '';
         foreach ($licences as $licence => $value) {
diff --git a/opt/learning/blocktype/learningstyles/lib.php b/opt/learning/blocktype/learningstyles/lib.php
index 2aca4239..4f429d21 100644
--- a/opt/learning/blocktype/learningstyles/lib.php
+++ b/opt/learning/blocktype/learningstyles/lib.php
@@ -80,7 +80,7 @@ public static function has_instance_config() {
         return true;
     }
 
-    public static function instance_config_form($instance, $istemplate) {
+    public static function instance_config_form(BlockInstance $instance, $istemplate) {
 		//log_debug($userid);
 
         if ($istemplate) {