diff --git a/include/audacity/Types.h b/include/audacity/Types.h
index 63f028964..4b763e39b 100644
--- a/include/audacity/Types.h
+++ b/include/audacity/Types.h
@@ -45,6 +45,7 @@
 #include <algorithm>
 #include <wx/string.h>
 #include <wx/arrstr.h>
+#include <type_traits>
 
 // ----------------------------------------------------------------------------
 // TODO:  I'd imagine this header may be replaced by other public headers. But,
@@ -90,7 +91,7 @@ public:
 
    size_t as_size_t() const {
       wxASSERT(value >= 0);
-      wxASSERT(value <= std::numeric_limits<size_t>::max());
+      wxASSERT(static_cast<std::make_unsigned<type>::type>(value) <= std::numeric_limits<size_t>::max());
       return value;
    }
 
diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp
index 0ffd76269..ae6254ee0 100644
--- a/src/BatchCommands.cpp
+++ b/src/BatchCommands.cpp
@@ -704,7 +704,7 @@ bool MacroCommands::ApplyEffectCommand(
    const wxString & command, const wxString & params,
    const CommandContext & Context)
 {
-   (void*)&command;//compiler food.
+   static_cast<void>(command);//compiler food.
 
    //Possibly end processing here, if in batch-debug
    if( ReportAndSkip(friendlyCommand, params))
diff --git a/src/SampleFormat.cpp b/src/SampleFormat.cpp
index ff115d7fe..84611bafb 100644
--- a/src/SampleFormat.cpp
+++ b/src/SampleFormat.cpp
@@ -90,7 +90,7 @@ void ReverseSamples(samplePtr dst, sampleFormat format,
    samplePtr first = dst + start * size;
    samplePtr last = dst + (start + len - 1) * size;
    enum : size_t { fixedSize = SAMPLE_SIZE(floatSample) };
-   wxASSERT(size <= fixedSize);
+   wxASSERT(static_cast<size_t>(size) <= fixedSize);
    char temp[fixedSize];
    while (first < last) {
       memcpy(temp, first, size);