diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
index f78c742a7..9005cd9f0 100644
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@@ -859,18 +859,15 @@ class ContiguousInternalMemoryDataFacade : public BaseDataFacade
         const unsigned end = m_geometry_indices.at(id + 1);
 
         std::vector<DatasourceID> result_datasources;
-        result_datasources.resize(end - begin);
 
         // If there was no datasource info, return an array of 0's.
         if (m_datasource_list.empty())
         {
-            for (unsigned i = 0; i < end - begin; ++i)
-            {
-                result_datasources.push_back(0);
-            }
+            result_datasources.resize(end - begin, 0);
         }
         else
         {
+            result_datasources.resize(end - begin);
             std::copy(m_datasource_list.begin() + begin,
                       m_datasource_list.begin() + end,
                       result_datasources.begin());
@@ -902,13 +899,11 @@ class ContiguousInternalMemoryDataFacade : public BaseDataFacade
         // If there was no datasource info, return an array of 0's.
         if (m_datasource_list.empty())
         {
-            for (unsigned i = 0; i < end - begin; ++i)
-            {
-                result_datasources.push_back(0);
-            }
+            result_datasources.resize(end - begin, 0);
         }
         else
         {
+            result_datasources.resize(end - begin);
             std::copy(m_datasource_list.rbegin() + (m_datasource_list.size() - end),
                       m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
                       result_datasources.begin());
diff --git a/include/storage/io.hpp b/include/storage/io.hpp
index 464083a08..591941933 100644
--- a/include/storage/io.hpp
+++ b/include/storage/io.hpp
@@ -91,7 +91,7 @@ class FileReader
         const auto &result = input_stream.read(reinterpret_cast<char *>(dest), count * sizeof(T));
         const std::size_t bytes_read = input_stream.gcount();
 
-        if (bytes_read != count && !result)
+        if (bytes_read != count * sizeof(T) && !result)
         {
             if (result.eof())
             {
diff --git a/src/contractor/graph_contractor.cpp b/src/contractor/graph_contractor.cpp
index 2cbdced67..0a3833ccf 100644
--- a/src/contractor/graph_contractor.cpp
+++ b/src/contractor/graph_contractor.cpp
@@ -349,11 +349,11 @@ void GraphContractor::Run(double core_factor)
                         edge.data.backward == current_data.backward)
                     {
                         // found a duplicate edge with smaller weight, update it.
-			if (edge.data.weight < current_data.weight)
-			{
-				current_data = edge.data;
-			}
-			// don't insert duplicates
+                        if (edge.data.weight < current_data.weight)
+                        {
+                            current_data = edge.data;
+                        }
+                        // don't insert duplicates
                         continue;
                     }
                 }