diff --git a/Makefile b/Makefile
index 31986582e..b7ad2c117 100644
--- a/Makefile
+++ b/Makefile
@@ -67,25 +67,25 @@ CXXFLAGS_TEST+= -Wall -Wextra -Wno-unused-parameter
 CFLAGS_TEST+= -Wall -Wextra -Wno-unused-parameter
 
 ifdef HAVE_GCC
-  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20
-  CFLAGS+= -Wno-multichar -Wunused
+  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
+  CFLAGS+= -Wunused
 
-	CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20
+  CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
   CFLAGS_TEST+= -Wno-multichar -Wunused
 endif
 
 ifdef HAVE_CLANG
-  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20
-  CFLAGS+= -Wno-multichar -Wunused
+  CXXFLAGS+= -Wunused -Woverloaded-virtual -std=c++20
+  CFLAGS+= -Wunused
 
-  CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20
+  CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
   CFLAGS_TEST+= -Wno-multichar -Wunused
 endif
 
 ifdef CLANG_WARNINGS
-  EXTRA_WARN=-Wno-c++98-compat-pedantic -Wno-unknown-warning-option \
+  EXTRA_WARN=-Wno-c++98-compat-pedantic -Wno-undefined-func-template \
     -Wno-switch-enum -Wno-conversion -Wno-covered-switch-default \
-    -Wno-inconsistent-missing-destructor-override -Wno-float-equal \
+    -Wno-documentation -Wno-float-equal \
     -Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \
     -Wno-four-char-constants -Wno-padded -Wno-reserved-identifier \
     -Wno-duplicate-enum -Wno-unsafe-buffer-usage
diff --git a/src/common/SDL_lib.hxx b/src/common/SDL_lib.hxx
index d344deab0..cd57a346f 100644
--- a/src/common/SDL_lib.hxx
+++ b/src/common/SDL_lib.hxx
@@ -31,6 +31,7 @@
   #pragma clang diagnostic ignored "-Wimplicit-fallthrough"
   #pragma clang diagnostic ignored "-Wreserved-id-macro"
   #pragma clang diagnostic ignored "-Wold-style-cast"
+  #pragma clang diagnostic ignored "-Wreserved-identifier"
   #pragma clang diagnostic ignored "-Wswitch-default"
   #include <SDL.h>
   #pragma clang diagnostic pop
diff --git a/src/emucore/CartELF.hxx b/src/emucore/CartELF.hxx
index 5e42fa3c7..56c8b33d6 100644
--- a/src/emucore/CartELF.hxx
+++ b/src/emucore/CartELF.hxx
@@ -72,7 +72,7 @@ class CartridgeELF: public Cartridge {
 
     const ByteBuffer& getImage(size_t& size) const override;
 
-    string name() const override { return "CartridgeELF"; };
+    string name() const override { return "CartridgeELF"; }
 
     uInt8 overdrivePeek(uInt16 address, uInt8 value) override;
 
diff --git a/src/emucore/CortexM0.cxx b/src/emucore/CortexM0.cxx
index 36bd87da7..6a761120f 100644
--- a/src/emucore/CortexM0.cxx
+++ b/src/emucore/CortexM0.cxx
@@ -91,8 +91,8 @@ namespace {
 #define do_cflag_bit(x) cFlag = (x)
 #define do_vflag_bit(x) vFlag = (x)
 
-#define branch_target_9(inst) (read_register(15) + 2 + (((Int32)(inst) << 24) >> 23))
-#define branch_target_12(inst) (read_register(15) + 2 + (((Int32)(inst) << 21) >> 20))
+#define branch_target_9(inst) (read_register(15) + 2 + ((static_cast<Int32>(inst) << 24) >> 23))
+#define branch_target_12(inst) (read_register(15) + 2 + ((static_cast<Int32>(inst) << 21) >> 20))
 
 namespace {
   constexpr uInt32 PAGEMAP_SIZE = 0x100000000 / 4096;
diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx
index b9f77335a..149c2a245 100644
--- a/src/emucore/Device.hxx
+++ b/src/emucore/Device.hxx
@@ -119,7 +119,7 @@ class Device : public Serializable
       @return The byte at the specified address
     */
     virtual uInt8 peek(uInt16 address) = 0;
-    virtual uInt8 peekOob(uInt16 address) { return peek(address); };
+    virtual uInt8 peekOob(uInt16 address) { return peek(address); }
 
     /**
       Change the byte at the specified address to the given value