diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h
index 13f4903666..e0725f7b6e 100644
--- a/DataStructures/StaticRTree.h
+++ b/DataStructures/StaticRTree.h
@@ -280,7 +280,7 @@ class StaticRTree : boost::noncopyable
                                << " edge elements build on-top of " << coordinate_list.size()
                                << " coordinates";
 
-        std::chrono::time_point<std::chrono::steady_clock> time0 = std::chrono::steady_clock::now();
+        auto time0 = std::chrono::steady_clock::now();
         std::vector<WrappedInputElement> input_wrapper_vector(m_element_count);
 
         HilbertCode get_hilbert_number;
@@ -411,7 +411,7 @@ class StaticRTree : boost::noncopyable
         tree_node_file.write((char *)&m_search_tree[0], sizeof(TreeNode) * size_of_tree);
         // close tree node file.
         tree_node_file.close();
-        std::chrono::time_point<std::chrono::steady_clock> time1 = std::chrono::steady_clock::now();
+        auto time1 = std::chrono::steady_clock::now();
         std::chrono::duration<double> elapsed_seconds = time1 - time0;
         SimpleLogger().Write() << "finished r-tree construction in " << (elapsed_seconds.count())
                                << " seconds";
diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp
index 5403fb75f3..200d7e01d5 100644
--- a/Extractor/ExtractionContainers.cpp
+++ b/Extractor/ExtractionContainers.cpp
@@ -60,7 +60,7 @@ void ExtractionContainers::PrepareData(
     try {
         unsigned number_of_used_nodes = 0;
         unsigned number_of_used_edges = 0;
-        std::chrono::time_point<std::chrono::steady_clock> time1 = std::chrono::steady_clock::now();
+        auto time1 = std::chrono::steady_clock::now();
 
         std::cout << "[extractor] Sorting used nodes        ... " << std::flush;
         stxxl::sort(
@@ -69,7 +69,7 @@ void ExtractionContainers::PrepareData(
             Cmp(),
             4294967296
         );
-        std::chrono::time_point<std::chrono::steady_clock> time2 = std::chrono::steady_clock::now();
+        auto time2 = std::chrono::steady_clock::now();
         std::chrono::duration<double> elapsed_seconds = time2-time1;
         std::cout << "ok, after " << elapsed_seconds.count() << "s" << std::endl;
 
diff --git a/extractor.cpp b/extractor.cpp
index f06b7a2e51..dc925bf598 100644
--- a/extractor.cpp
+++ b/extractor.cpp
@@ -55,7 +55,7 @@ UUIDC uuid;
 int main (int argc, char *argv[]) {
     try {
         LogPolicy::GetInstance().Unmute();
-        std::chrono::time_point<std::chrono::steady_clock> startup_time = std::chrono::steady_clock::now();
+        auto startup_time = std::chrono::steady_clock::now();
 
         boost::filesystem::path config_file_path, input_path, profile_path;
         int requested_num_threads;
@@ -221,7 +221,7 @@ int main (int argc, char *argv[]) {
             throw OSRMException("Parser not initialized!");
         }
         SimpleLogger().Write() << "Parsing in progress..";
-        std::chrono::time_point<std::chrono::steady_clock> parsing_start_time = std::chrono::steady_clock::now();
+        auto parsing_start_time = std::chrono::steady_clock::now();
 
         parser->Parse();
         std::chrono::duration<double> parsing_duration = std::chrono::steady_clock::now() - parsing_start_time;
diff --git a/prepare.cpp b/prepare.cpp
index 80823c5df7..ea884c00ac 100644
--- a/prepare.cpp
+++ b/prepare.cpp
@@ -66,7 +66,7 @@ std::vector<ImportEdge> edgeList;
 int main (int argc, char *argv[]) {
     try {
         LogPolicy::GetInstance().Unmute();
-        std::chrono::time_point<std::chrono::steady_clock> startupTime = std::chrono::steady_clock::now();
+        auto startupTime = std::chrono::steady_clock::now();
 
         boost::filesystem::path config_file_path, input_path, restrictions_path, profile_path;
         int requested_num_threads;
@@ -294,10 +294,12 @@ int main (int argc, char *argv[]) {
         boost::filesystem::ofstream mapOutFile(nodeOut, std::ios::binary);
         const unsigned size_of_mapping = internalToExternalNodeMapping.size();
         mapOutFile.write((char *)&size_of_mapping, sizeof(unsigned));
-        mapOutFile.write(
-            (char *)&(internalToExternalNodeMapping[0]),
-            size_of_mapping*sizeof(NodeInfo)
-        );
+	if (size_of_mapping > 0) {
+            mapOutFile.write(
+                (char *)&(internalToExternalNodeMapping[0]),
+                size_of_mapping*sizeof(NodeInfo)
+            );
+        }
         mapOutFile.close();
         std::vector<NodeInfo>().swap(internalToExternalNodeMapping);
 
@@ -307,7 +309,7 @@ int main (int argc, char *argv[]) {
 
         SimpleLogger().Write() << "initializing contractor";
         Contractor* contractor = new Contractor( edgeBasedNodeNumber, edgeBasedEdgeList );
-        std::chrono::time_point<std::chrono::steady_clock> contraction_start_timestamp = std::chrono::steady_clock::now();
+        auto contraction_start_timestamp = std::chrono::steady_clock::now();
 
         contractor->Run();
         std::chrono::duration<double> contraction_duration = std::chrono::steady_clock::now() - contraction_start_timestamp;