diff --git a/admin/webservice/tokens.php b/admin/webservice/tokens.php
index 5f4e0875df2..cd9903c5f35 100644
--- a/admin/webservice/tokens.php
+++ b/admin/webservice/tokens.php
@@ -168,7 +168,6 @@ foreach ($filterdata->services as $i => $serviceid) {
 $table->define_baseurl($baseurl);
 
 $table->attributes['class'] = 'admintable generaltable';
-$table->data = [];
 $table->out(30, false);
 
 echo $OUTPUT->footer();
diff --git a/webservice/lib.php b/webservice/lib.php
index 503deaf9809..6ff9d67ad3b 100644
--- a/webservice/lib.php
+++ b/webservice/lib.php
@@ -1255,6 +1255,9 @@ abstract class webservice_base_server extends webservice_server {
     /** @var  array List of struct classes generated for the web service methods. */
     protected $servicestructs;
 
+    /** @var string service class name. */
+    protected $serviceclass;
+
     /**
      * This method parses the request input, it needs to get:
      *  1/ user authentication - username+password or token