diff --git a/bqplot/_version.py b/bqplot/_version.py
index 2f052828c..51c6a169f 100644
--- a/bqplot/_version.py
+++ b/bqplot/_version.py
@@ -1,4 +1,4 @@
-version_info = (0, 12, 34, 'final', 0)
+version_info = (0, 12, 35, 'final', 0)
 
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}
 
diff --git a/js/package.json b/js/package.json
index 3e006e1ab..f75953460 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bqplot",
-  "version": "0.5.35",
+  "version": "0.5.36",
   "description": "bqplot",
   "keywords": [
     "jupyter",
diff --git a/js/src/Figure.ts b/js/src/Figure.ts
index cbe950732..4aab89bc5 100644
--- a/js/src/Figure.ts
+++ b/js/src/Figure.ts
@@ -731,8 +731,17 @@ export class Figure extends widgets.DOMWidgetView {
     this.plotarea_height = this.height - this.margin.top - this.margin.bottom;
   }
 
+  processPhosphorMessage(msg) {
+    // @ts-ignore: The following line can only compile with ipywidgets 7
+    this._processLuminoMessage(msg, super.processPhosphorMessage);
+  }
+
   processLuminoMessage(msg) {
-    super.processLuminoMessage.apply(this, arguments);
+    this._processLuminoMessage(msg, super.processLuminoMessage);
+  }
+
+  _processLuminoMessage(msg, _super) {
+    _super.call(this, msg);
 
     switch (msg.type) {
       case 'resize':
diff --git a/setup.cfg b/setup.cfg
index b9b9264c8..463c31505 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,11 @@ install_requires =
     pandas>=1.0.0,<2.0.0
 classifiers =
     Framework :: Jupyter
+    Framework :: Jupyter :: JupyterLab
+    Framework :: Jupyter :: JupyterLab :: 2
+    Framework :: Jupyter :: JupyterLab :: 3
+    Framework :: Jupyter :: JupyterLab :: Extensions
+    Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt
     Intended Audience :: Developers
     Intended Audience :: Science/Research
     Topic :: Multimedia :: Graphics
@@ -35,5 +40,9 @@ python_requires = >=3.6
 include_package_data = True
 zip_safe = False
 
+[options.packages.find]
+exclude = 
+	tests
+
 [bdist_wheel]
 universal=1