diff --git a/src/adapters/DereferenceIteratorAdapter.h b/src/adapters/DereferenceIteratorAdapter.h
index 70f5ea3c1..5ac08d780 100644
--- a/src/adapters/DereferenceIteratorAdapter.h
+++ b/src/adapters/DereferenceIteratorAdapter.h
@@ -42,11 +42,11 @@ namespace storm {
             }
             
             decltype((*std::declval<value_type>())) front() const {
-                return *it;
+                return **it;
             }
 
             decltype((*std::declval<value_type>())) back() const {
-                return *(ite - 1);
+                return **(ite - 1);
             }
             
             std::size_t size() const {
diff --git a/src/generator/JaniNextStateGenerator.cpp b/src/generator/JaniNextStateGenerator.cpp
index 5b86fec6e..0e4f6cc7a 100644
--- a/src/generator/JaniNextStateGenerator.cpp
+++ b/src/generator/JaniNextStateGenerator.cpp
@@ -64,8 +64,8 @@ namespace storm {
                 if (rewardVariables.empty() && !this->options.getRewardModelNames().empty()) {
                     bool foundTransientVariable = false;
                     for (auto const& transientVariable : globalVariables.getTransientVariables()) {
-                        if (transientVariable->isUnboundedIntegerVariable() || transientVariable->isRealVariable()) {
-                            rewardVariables.push_back(transientVariable->getExpressionVariable());
+                        if (transientVariable.isUnboundedIntegerVariable() || transientVariable.isRealVariable()) {
+                            rewardVariables.push_back(transientVariable.getExpressionVariable());
                             foundTransientVariable = true;
                             break;
                         }
@@ -632,9 +632,9 @@ namespace storm {
             // create a list of boolean transient variables and the expressions that define them.
             std::unordered_map<storm::expressions::Variable, storm::expressions::Expression> transientVariableToExpressionMap;
             for (auto const& variable : model.getGlobalVariables().getTransientVariables()) {
-                if (variable->isBooleanVariable()) {
-                    if (this->options.isBuildAllLabelsSet() || this->options.getLabelNames().find(variable->getName()) != this->options.getLabelNames().end()) {
-                        transientVariableToExpressionMap[variable->getExpressionVariable()] = model.getLabelExpression(variable->asBooleanVariable(), locationVariables);
+                if (variable.isBooleanVariable()) {
+                    if (this->options.isBuildAllLabelsSet() || this->options.getLabelNames().find(variable.getName()) != this->options.getLabelNames().end()) {
+                        transientVariableToExpressionMap[variable.getExpressionVariable()] = model.getLabelExpression(variable.asBooleanVariable(), locationVariables);
                     }
                 }
             }