diff --git a/dbcon/joblist/joblist.cpp b/dbcon/joblist/joblist.cpp
index 023b21bb6..bb71996c1 100644
--- a/dbcon/joblist/joblist.cpp
+++ b/dbcon/joblist/joblist.cpp
@@ -1156,11 +1156,7 @@ void JobList::abort()
         for (i = 0; i < fProject.size(); i++)
             fProject[i]->abort();
 
-        for (i = 0; i < fQuery.size(); i++)
-            fQuery[i]->join();
 
-        for (i = 0; i < fProject.size(); i++)
-            fProject[i]->join();
     }
 }
 
diff --git a/dbcon/joblist/limitedorderby.cpp b/dbcon/joblist/limitedorderby.cpp
index d5db83552..64caf078c 100644
--- a/dbcon/joblist/limitedorderby.cpp
+++ b/dbcon/joblist/limitedorderby.cpp
@@ -147,12 +147,11 @@ void LimitedOrderBy::processRow(const rowgroup::Row& row)
     {
         OrderByRow swapRow = fOrderByQueue.top();
         row1.setData(swapRow.fData);
-
         copyRow(row, &row1);
 
         if (fDistinct)
         {
-            fDistinctMap->erase(fOrderByQueue.top().fData);
+			fDistinctMap->erase(fOrderByQueue.top().fData);
             fDistinctMap->insert(row1.getPointer());
         }
 
diff --git a/dbcon/mysql/is_columnstore_files.cpp b/dbcon/mysql/is_columnstore_files.cpp
index be0411058..2ce7b1996 100644
--- a/dbcon/mysql/is_columnstore_files.cpp
+++ b/dbcon/mysql/is_columnstore_files.cpp
@@ -114,7 +114,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
         if (iter->blockOffset > 0)
         {
             iter++;
-            return 0;
+            continue;
         }
 
         try
diff --git a/utils/windowfunction/idborderby.cpp b/utils/windowfunction/idborderby.cpp
index bac14bec8..db5cdf1c1 100644
--- a/utils/windowfunction/idborderby.cpp
+++ b/utils/windowfunction/idborderby.cpp
@@ -462,7 +462,7 @@ uint64_t IdbOrderBy::Hasher::operator()(const Row::Pointer& p) const
     Row& row = ts->row1;
     row.setPointer(p);
     // MCOL-1829 Row::h uses colcount as an array idx down a callstack.
-    uint64_t ret = row.hash();//(colCount - 1);
+    uint64_t ret = row.hash();
     //cout << "hash(): returning " << ret << " for row: " << row.toString() << endl;
     return ret;
 }