diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
index 27318b23b..0402eb174 100644
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@@ -303,6 +303,7 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(
         for( unsigned i = 0; i < reverse_geometry.size(); ++i ) {
             if( forward_geometry[i].first != reverse_geometry[reverse_geometry.size()-1-i].first ) {
 #ifndef NDEBUG
+                //Dumps debug information when data is borked
                 SimpleLogger().Write() << "size1: " << forward_geometry.size() << ", size2: " << reverse_geometry.size();
                 SimpleLogger().Write() << "index1: " << i << ", index2: " << reverse_geometry.size()-1-i;
                 SimpleLogger().Write() << forward_geometry[0].first << "!=" << reverse_geometry[reverse_geometry.size()-1-i].first;
diff --git a/DataStructures/HashTable.h b/DataStructures/HashTable.h
index b4984e4b5..871ba4933 100644
--- a/DataStructures/HashTable.h
+++ b/DataStructures/HashTable.h
@@ -54,7 +54,7 @@ public:
         return boost::cref(iter->second);
     }
 
-    inline bool Holds( KeyT const & key) const {
+    inline const bool Holds( KeyT const & key) const {
         if( super::find(key) == super::end() ) {
             return false;
         }
diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h
index da5821c08..62aa2a056 100644
--- a/DataStructures/StaticRTree.h
+++ b/DataStructures/StaticRTree.h
@@ -82,7 +82,7 @@ public:
         int32_t min_lat, max_lat;
 
         inline void InitializeMBRectangle(
-                const DataT * objects,
+                DataT const * objects,
                 const uint32_t element_count
         ) {
             for(uint32_t i = 0; i < element_count; ++i) {
@@ -221,9 +221,9 @@ public:
         }
 
         inline bool Contains(const FixedPointCoordinate & location) const {
-            bool lats_contained =
+            const bool lats_contained =
                     (location.lat > min_lat) && (location.lat < max_lat);
-            bool lons_contained =
+            const bool lons_contained =
                     (location.lon > min_lon) && (location.lon < max_lon);
             return lats_contained && lons_contained;
         }
@@ -315,7 +315,7 @@ public:
         for(uint64_t element_counter = 0; element_counter < m_element_count; ++element_counter) {
             input_wrapper_vector[element_counter].m_array_index = element_counter;
             //Get Hilbert-Value for centroid in mercartor projection
-            DataT & current_element = input_data_vector[element_counter];
+            DataT const & current_element = input_data_vector[element_counter];
             FixedPointCoordinate current_centroid = current_element.Centroid();
             current_centroid.lat = COORDINATE_PRECISION*lat2y(current_centroid.lat/COORDINATE_PRECISION);
 
@@ -526,7 +526,7 @@ public:
                         current_leaf_node
                     );
                     for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) {
-                        const DataT & current_edge = current_leaf_node.objects[i];
+                        DataT const & current_edge = current_leaf_node.objects[i];
                         if(
                             ignore_tiny_components &&
                             current_edge.belongsToTinyComponent
diff --git a/Extractor/ScriptingEnvironment.cpp b/Extractor/ScriptingEnvironment.cpp
index d904b649a..c51ddd813 100644
--- a/Extractor/ScriptingEnvironment.cpp
+++ b/Extractor/ScriptingEnvironment.cpp
@@ -58,7 +58,7 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
         // Add our function to the state's global scope
         luabind::module(myLuaState) [
             luabind::def("print", LUA_print<std::string>),
-            luabind::def("parseMaxspeed", parseMaxspeed),
+            // luabind::def("parseMaxspeed", parseMaxspeed),
             luabind::def("durationIsValid", durationIsValid),
             luabind::def("parseDuration", parseDuration)
         ];
@@ -66,7 +66,7 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
         luabind::module(myLuaState) [
             luabind::class_<HashTable<std::string, std::string> >("keyVals")
             .def("Add", &HashTable<std::string, std::string>::Add)
-            .def("Find", &HashTable<std::string, std::string>::Find)
+            .def("Get", &HashTable<std::string, std::string>::Get)
             .def("Holds", &HashTable<std::string, std::string>::Holds)
         ];