diff --git a/selfdrive/common/visionimg.cc b/selfdrive/common/visionimg.cc
index 35fe7095d0..e0220c18f2 100644
--- a/selfdrive/common/visionimg.cc
+++ b/selfdrive/common/visionimg.cc
@@ -49,7 +49,7 @@ VisionImg visionimg_alloc_rgb24(int width, int height, VisionBuf *out_buf) {
   visionimg_compute_aligned_width_and_height(width, height, &aligned_w, &aligned_h);
 
   int stride = aligned_w * 3;
-  size_t size = aligned_w * aligned_h * 3;
+  size_t size = (size_t) aligned_w * aligned_h * 3;
 
   VisionBuf buf = visionbuf_allocate(size);
 
diff --git a/selfdrive/locationd/ubloxd_test.cc b/selfdrive/locationd/ubloxd_test.cc
index fc7146625f..b63e26b82d 100644
--- a/selfdrive/locationd/ubloxd_test.cc
+++ b/selfdrive/locationd/ubloxd_test.cc
@@ -26,13 +26,13 @@
 using namespace ublox;
 extern volatile sig_atomic_t do_exit;
 
-void write_file(std::string fpath, uint8_t *to_write, int len) {
+void write_file(std::string fpath, uint8_t *to_write, int length) {
   FILE* f = fopen(fpath.c_str(), "wb");
   if (!f) {
     std::cout << "Open " << fpath << " failed" << std::endl;
     return;
   }
-  fwrite(to_write, len, 1, f);
+  fwrite(to_write, length, 1, f);
   fclose(f);
 }
 
diff --git a/tools/lib/index_log/index_log.cc b/tools/lib/index_log/index_log.cc
index 8eb4a5e34e..ee7c7502db 100644
--- a/tools/lib/index_log/index_log.cc
+++ b/tools/lib/index_log/index_log.cc
@@ -41,7 +41,6 @@ int main(int argc, char** argv) {
 
   auto words = kj::arrayPtr((const capnp::word*)log_data, log_size/sizeof(capnp::word));
   while (words.size() > 0) {
-
     uint64_t idx = ((uintptr_t)words.begin() - (uintptr_t)log_data);
     // printf("%llu - %ld\n", idx, words.size());
     const char* idx_bytes = (const char*)&idx;
@@ -49,11 +48,9 @@ int main(int argc, char** argv) {
     try {
       capnp::FlatArrayMessageReader reader(words);
       words = kj::arrayPtr(reader.getEnd(), words.end());
-    } catch (kj::Exception exc) {
+    } catch (const kj::Exception& exc) {
       break;
     }
-
-
   }
 
   munmap(log_data, log_size);