diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h
index 4a0d92602..0a3cdbdb0 100644
--- a/dbcon/joblist/primitivestep.h
+++ b/dbcon/joblist/primitivestep.h
@@ -1539,14 +1539,15 @@ private:
       int64_t ridsReturned_Thread = 0;
 
       // On init.
-      bool doJoin;
       boost::shared_ptr<funcexp::FuncExpWrapper> fe2;
       rowgroup::RowGroup fe2Output;
-      uint32_t smallSideCount;
       std::vector<rowgroup::RowGroup> joinerMatchesRGs;
       rowgroup::RowGroup joinFERG;
       std::vector<boost::shared_ptr<joiner::TupleJoiner>> tjoiners;
 
+      uint32_t smallSideCount;
+      bool doJoin;
+
       // Join vars.
       vector<vector<rowgroup::Row::Pointer>> joinerOutput;
       rowgroup::Row largeSideRow;
diff --git a/dbcon/joblist/tuple-bps.cpp b/dbcon/joblist/tuple-bps.cpp
index f57a05673..c34098004 100644
--- a/dbcon/joblist/tuple-bps.cpp
+++ b/dbcon/joblist/tuple-bps.cpp
@@ -175,7 +175,6 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
         local_fe2Output.initRow(&local_fe2OutRow);
         local_fe2Data.reinit(fe2Output);
         local_fe2Output.setData(&local_fe2Data);
-        // local_fe2OutRow = fe2OutRow;
         local_fe2 = *fe2;
     }
 
@@ -196,7 +195,7 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
 
         bool hasJoinFE = false;
 
-        for (int i = 0; i < smallSideCount; i++)
+        for (uint32_t i = 0; i < smallSideCount; ++i)
         {
             joinerMatchesRGs[i].initRow(&(smallSideRows[i]));
             smallMappings[i] = makeMapping(joinerMatchesRGs[i], local_outputRG);
@@ -217,7 +216,7 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
             fergMappings[smallSideCount] = makeMapping(local_primRG, joinFERG);
         }
 
-        for (int i = 0; i < smallSideCount; i++)
+        for (uint32_t i = 0; i < smallSideCount; ++i)
         {
             joinerMatchesRGs[i].initRow(&(smallNulls[i]), true);
             smallNullMemory[i].reset(new uint8_t[smallNulls[i].getSize()]);
@@ -2445,8 +2444,6 @@ void TupleBPS::receiveMultiPrimitiveMessages()
         abort_nolock();
     }
 
-out:
-
     // We have on thread here and do not need to notify any waiting producer threads, because we are done of
     // consuming messages from queue.
     tplLock.unlock();