diff --git a/wpilibc/src/main/native/include/frc/PIDSource.h b/wpilibc/src/main/native/include/frc/PIDSource.h
index ce6f41f7f8..1a807b10b9 100644
--- a/wpilibc/src/main/native/include/frc/PIDSource.h
+++ b/wpilibc/src/main/native/include/frc/PIDSource.h
@@ -19,6 +19,8 @@ enum class PIDSourceType { kDisplacement, kRate };
  */
 class PIDSource {
  public:
+  virtual ~PIDSource() = default;
+
   /**
    * Set which parameter you are using as a process control variable.
    *
diff --git a/wpiutil/src/test/native/cpp/test_optional.cpp b/wpiutil/src/test/native/cpp/test_optional.cpp
index 779cc18399..e64f0c2a1f 100644
--- a/wpiutil/src/test/native/cpp/test_optional.cpp
+++ b/wpiutil/src/test/native/cpp/test_optional.cpp
@@ -625,6 +625,9 @@ TEST(Optional, example_rationale)
   optional<optional<T>> ot {in_place};
   optional<optional<T>> ou {in_place, nullopt};
   optional<optional<T>> ov {optional<T>{}};
+
+  (void) ot;
+  (void) ou;
   
   optional<int> oi;
   auto ooi = make_optional(oi);