diff --git a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
index 89cc00993db67af8e2b3ce262facce323310bfad..8119aea3957dcecac2ca1ade397159d6678b34e7 100644
--- a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
+++ b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
@@ -72,7 +72,7 @@ class UsbTransportSniffer : public UsbTransport {
 
     virtual ssize_t Read(void* data, size_t len) override;
     virtual ssize_t Write(const void* data, size_t len) override;
-    virtual int Close() override;
+    virtual int Close() override final;  // note usage in destructor
     virtual int Reset() override;
 
     const std::vector<Event> Transfers();
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index c44e4416b3c9d8e6e02d4b1fe42d267da815042c..bebcc71928f3f7cea98acf935555d71ea0241806 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -1230,7 +1230,7 @@ TEST(logcat, blocking_clear) {
         }
 
         int size, consumed, max, payload;
-        char size_mult[3], consumed_mult[3];
+        char size_mult[4], consumed_mult[4];
         size = consumed = max = payload = 0;
         if (6 == sscanf(buffer,
                         "events: ring buffer is %d %3s (%d %3s consumed),"