diff --git a/timeseriesviewer/classification/classificationscheme.py b/timeseriesviewer/classification/classificationscheme.py
index bf6340a2455046016d9cdea048770e64bcf0ebbb..089a199d38dd2b5b830bb775e4df697d1ed0fb8c 100644
--- a/timeseriesviewer/classification/classificationscheme.py
+++ b/timeseriesviewer/classification/classificationscheme.py
@@ -27,7 +27,7 @@ from qgis.PyQt.QtGui import *
 from qgis.PyQt.QtWidgets import *
 import numpy as np
 from osgeo import gdal
-from enmapbox.gui.utils import gdalDataset, nextColor, loadUIFormClass
+from timeseriesviewer.utils import *
 
 from itertools import cycle
 
@@ -1427,8 +1427,8 @@ class ClassificationSchemeWidget(QWidget, loadClassificationUI('classificationsc
             self.mScheme.removeClasses(classes)
 
     def loadClasses(self, *args):
-        from enmapbox import enmapboxSettings
-        settings = enmapboxSettings()
+
+        settings = QSettings('HUB','ClassificationScheme')
         settingsKey = 'DEF_DIR_ClassificationSchemeWidget.loadClasses'
         defDir = settings.value(settingsKey, None)
         path, _ = QFileDialog.getOpenFileName(self, 'Select Raster File', directory=defDir)
diff --git a/timeseriesviewer/mapcanvas.py b/timeseriesviewer/mapcanvas.py
index f0fe50d6c314e98a2e0fb92b90ef1c1d923a7eaa..b1dea7763e681342f72ffeed494413e0c247306e 100644
--- a/timeseriesviewer/mapcanvas.py
+++ b/timeseriesviewer/mapcanvas.py
@@ -356,9 +356,9 @@ class MapCanvas(QgsMapCanvas):
 
         scope = self.expressionContextScope()
         scope.setVariable('map_date', str(tsd.date), isStatic=True)
-        scope.setVariable('map_doy', tsd.doy, isStatic=True)
-        scope.setVariable('map_sensor', tsd.sensor.name(), isStatic=False)
-        tsd.sensor.sigNameChanged.connect(lambda name : scope.setVariable('map_sensor', name))
+        scope.setVariable('map_doy', tsd.mDOY, isStatic=True)
+        scope.setVariable('map_sensor', tsd.sensor().name(), isStatic=False)
+        tsd.sensor().sigNameChanged.connect(lambda name : scope.setVariable('map_sensor', name))
 
         s = ""
 
diff --git a/timeseriesviewertesting/test_init.py b/timeseriesviewertesting/test_init.py
index 695da74dfe7a6e4a0e58611cadd41bbc7ea1aa4c..caff7d2d7c2877639aa6aa6d2c6f724726a72f26 100644
--- a/timeseriesviewertesting/test_init.py
+++ b/timeseriesviewertesting/test_init.py
@@ -19,7 +19,7 @@
 # noinspection PyPep8Naming
 
 import os, sys, unittest, configparser
-from timeseriesviewertesting import initQgisApplication
+from timeseriesviewertesting import initQgisApplication, TestObjects
 APP = initQgisApplication()
 
 from timeseriesviewer.main import *