diff --git a/src/ccmain/paragraphs.cpp b/src/ccmain/paragraphs.cpp
index 513e4c39c3..84b77092ce 100644
--- a/src/ccmain/paragraphs.cpp
+++ b/src/ccmain/paragraphs.cpp
@@ -2444,7 +2444,7 @@ static void InitializeRowInfo(bool after_recognition,
   info->rword_likely_starts_idea = false;
   info->rword_likely_ends_idea = false;
   info->has_leaders = false;
-  info->ltr = 1;
+  info->ltr = true;
 
   if (!after_recognition) {
     InitializeTextAndBoxesPreRecognition(it, info);
diff --git a/src/dict/dawg.h b/src/dict/dawg.h
index 12d1ec09ab..cd8223656b 100644
--- a/src/dict/dawg.h
+++ b/src/dict/dawg.h
@@ -88,10 +88,10 @@ enum DawgType {
 #define REFFORMAT "%" PRId64
 
 static const bool kDawgSuccessors[DAWG_TYPE_COUNT][DAWG_TYPE_COUNT] = {
-  { 0, 1, 1, 0 },  // for DAWG_TYPE_PUNCTUATION
-  { 1, 0, 0, 0 },  // for DAWG_TYPE_WORD
-  { 1, 0, 0, 0 },  // for DAWG_TYPE_NUMBER
-  { 0, 0, 0, 0 },  // for DAWG_TYPE_PATTERN
+  { false, true, true, false },  // for DAWG_TYPE_PUNCTUATION
+  { true, false, false, false },  // for DAWG_TYPE_WORD
+  { true, false, false, false },  // for DAWG_TYPE_NUMBER
+  { false, false, false, false },  // for DAWG_TYPE_PATTERN
 };
 
 static const char kWildcard[] = "*";
diff --git a/src/dict/trie.cpp b/src/dict/trie.cpp
index 292b0e0639..bfa4ba5b6c 100644
--- a/src/dict/trie.cpp
+++ b/src/dict/trie.cpp
@@ -514,7 +514,7 @@ SquishedDawg *Trie::trie_to_dawg() {
     print_all("Before reduction:", MAX_NODE_EDGES_DISPLAY);
   }
   auto reduced_nodes = new bool[nodes_.size()];
-  for (int i = 0; i < nodes_.size(); i++) reduced_nodes[i] = 0;
+  for (int i = 0; i < nodes_.size(); i++) reduced_nodes[i] = false;
   this->reduce_node_input(0, reduced_nodes);
   delete[] reduced_nodes;
 
@@ -634,7 +634,7 @@ bool Trie::reduce_lettered_edges(EDGE_INDEX edge_index,
           end_of_word_from_edge_rec(edge_rec) &&
           can_be_eliminated(next_edge_rec) &&
           eliminate_redundant_edges(node, edge_rec, next_edge_rec)) {
-        reduced_nodes[next_node_from_edge_rec(edge_rec)] = 0;
+        reduced_nodes[next_node_from_edge_rec(edge_rec)] = false;
         did_something = true;
         KillEdge(&(*backward_edges)[j]);
       }
diff --git a/src/viewer/scrollview.cpp b/src/viewer/scrollview.cpp
index f177612d62..e43f90b1d7 100644
--- a/src/viewer/scrollview.cpp
+++ b/src/viewer/scrollview.cpp
@@ -94,7 +94,7 @@ void* ScrollView::MessageReceiver(void* a) {
 // This is the main loop which iterates until the server is dead (strlen = -1).
 // It basically parses for 3 different messagetypes and then distributes the
 // events accordingly.
-  while (1) {
+  while (true) {
     // The new event we create.
     auto* cur = new SVEvent;
     // The ID of the corresponding window.