diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h
index fe5dd1b40..5ea22cbd9 100644
--- a/Extractor/ExtractorStructs.h
+++ b/Extractor/ExtractorStructs.h
@@ -52,10 +52,10 @@ struct _Way {
 		keyVals.EraseAll();
         direction = _Way::notSure;
         speed = -1;
+        duration = -1;
         type = -1;
         access = true;
         roundabout = false;
-        isDurationSet = false;
         isAccessRestricted = false;
         ignoreInGrid = false;
     }
@@ -67,10 +67,10 @@ struct _Way {
     unsigned nameID;
     std::string name;
     double speed;
+    double duration;
     short type;
     bool access;
     bool roundabout;
-    bool isDurationSet;
     bool isAccessRestricted;
     bool ignoreInGrid;
     std::vector< NodeID > path;
diff --git a/Extractor/ScriptingEnvironment.cpp b/Extractor/ScriptingEnvironment.cpp
index c2f42d79d..330eac6af 100644
--- a/Extractor/ScriptingEnvironment.cpp
+++ b/Extractor/ScriptingEnvironment.cpp
@@ -69,10 +69,10 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
                                      .def(luabind::constructor<>())
                                      .def_readwrite("name", &_Way::name)
                                      .def_readwrite("speed", &_Way::speed)
+                                     .def_readwrite("duration", &_Way::duration)
                                      .def_readwrite("type", &_Way::type)
                                      .def_readwrite("access", &_Way::access)
                                      .def_readwrite("roundabout", &_Way::roundabout)
-                                     .def_readwrite("is_duration_set", &_Way::isDurationSet)
                                      .def_readwrite("is_access_restricted", &_Way::isAccessRestricted)
                                      .def_readwrite("ignore_in_grid", &_Way::ignoreInGrid)
                                      .def_readwrite("tags", &_Way::keyVals)
diff --git a/Extractor/XMLParser.cpp b/Extractor/XMLParser.cpp
index 6449add3f..6b2c8a97d 100644
--- a/Extractor/XMLParser.cpp
+++ b/Extractor/XMLParser.cpp
@@ -139,7 +139,6 @@ bool XMLParser::Parse() {
 _RawRestrictionContainer XMLParser::_ReadXMLRestriction() {
 	_RawRestrictionContainer restriction;
 	std::string exception_of_restriction_tag;
-	bool restriction_is_excepted = false;
 
 	if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) {
 		const int depth = xmlTextReaderDepth( inputReader );while ( xmlTextReaderRead( inputReader ) == 1 ) {