diff --git a/src/storm/generator/TransientVariableInformation.h b/src/storm/generator/TransientVariableInformation.h
index 8f221c734..c6047f470 100644
--- a/src/storm/generator/TransientVariableInformation.h
+++ b/src/storm/generator/TransientVariableInformation.h
@@ -16,7 +16,7 @@ namespace storm {
     namespace jani {
         class Model;
         class Automaton;
-        class ArrayEliminatorData;
+        struct ArrayEliminatorData;
         class VariableSet;
     }
     
diff --git a/src/storm/generator/VariableInformation.h b/src/storm/generator/VariableInformation.h
index 0326e8d0c..4f6b99ec5 100644
--- a/src/storm/generator/VariableInformation.h
+++ b/src/storm/generator/VariableInformation.h
@@ -16,7 +16,7 @@ namespace storm {
     namespace jani {
         class Model;
         class Automaton;
-        class ArrayEliminatorData;
+        struct ArrayEliminatorData;
         class VariableSet;
     }
     
diff --git a/src/storm/storage/jani/Model.h b/src/storm/storage/jani/Model.h
index c0740a80c..401d1a54a 100644
--- a/src/storm/storage/jani/Model.h
+++ b/src/storm/storage/jani/Model.h
@@ -35,7 +35,7 @@ namespace storm {
         class Automaton;
         class Exporter;
         class SynchronizationVector;
-        class ArrayEliminatorData;
+        struct ArrayEliminatorData;
         class Property;
         
         class Model {
diff --git a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
index e355c4113..168ea960b 100644
--- a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
+++ b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
@@ -13,7 +13,6 @@ namespace storm {
             return storm::expressions::JaniExpressionSubstitutionVisitor<std::unordered_map<storm::expressions::Variable, storm::expressions::Expression>>(identifierToExpressionMap).substitute(expression);
         }
     }
-    
 
     namespace expressions {
         
diff --git a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
index 07867be28..6ae1c80fa 100644
--- a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
+++ b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
@@ -21,6 +21,7 @@ namespace storm {
              * @param variableToExpressionMapping A mapping from variables to expressions.
              */
             JaniExpressionSubstitutionVisitor(MapType const& variableToExpressionMapping);
+            using SubstitutionVisitor<MapType>::visit;
             
             virtual boost::any visit(ValueArrayExpression const& expression, boost::any const& data) override;
             virtual boost::any visit(ConstructorArrayExpression const& expression, boost::any const& data) override;