diff --git a/Modules/MicrochipBin2Hex.cmake b/Modules/MicrochipBin2Hex.cmake
index e9912e4..0bc9a02 100644
--- a/Modules/MicrochipBin2Hex.cmake
+++ b/Modules/MicrochipBin2Hex.cmake
@@ -50,7 +50,7 @@ function(bin2hex target)
     add_custom_command(
         TARGET ${target} POST_BUILD
         WORKING_DIRECTORY ${dir}
-        COMMAND "${MICROCHIP_BIN2HEX}" "${in_f}"
+        COMMAND "${MICROCHIP_BIN2HEX}" $<TARGET_FILE:${target}>
         BYPRODUCTS ${dir}/${out_f}
         VERBATIM
     )
diff --git a/Modules/Platform/MicrochipMCU-C-XC32.cmake b/Modules/Platform/MicrochipMCU-C-XC32.cmake
index 9addb1e..3ac6a79 100644
--- a/Modules/Platform/MicrochipMCU-C-XC32.cmake
+++ b/Modules/Platform/MicrochipMCU-C-XC32.cmake
@@ -33,9 +33,9 @@ set(CMAKE_FIND_ROOT_PATH ${MICROCHIP_XC32_PATH})
 set(CMAKE_C_COMPILER xc32-gcc)
 set(MICROCHIP_C_COMPILER_ID XC32)
 
-add_compile_options(
-    "-mprocessor=${MICROCHIP_MCU_MODEL}"
+string(APPEND CMAKE_C_FLAGS_INIT
+    " -mprocessor=${MICROCHIP_MCU_MODEL} "
 )
-string(APPEND CMAKE_C_LINK_FLAGS
-    " -mprocessor=${MICROCHIP_MCU_MODEL}"
+string(APPEND CMAKE_CXX_FLAGS_INIT
+    " -mprocessor=${MICROCHIP_MCU_MODEL} "
 )
diff --git a/toolchain.cmake b/toolchain.cmake
index 86a1429..a72c705 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -76,6 +76,7 @@ list(APPEND MICROCHIP_FAMILIES_16
 
 # known 32-bit MCU families
 list(APPEND MICROCHIP_FAMILIES_32
+    PIC32MM
     PIC32MX
     PIC32MZ
 )
@@ -97,7 +98,7 @@ elseif(MICROCHIP_MCU STREQUAL "generic32")
     set(MICROCHIP_MCU_MODEL    "generic")
     set(CMAKE_SYSTEM_PROCESSOR "PIC_32")
 
-elseif(MICROCHIP_MCU MATCHES "^(dsPIC|PIC)(32M[XZ]|[0-9]+[A-Z])([A-Z0-9]+)$")
+elseif(MICROCHIP_MCU MATCHES "^(dsPIC|PIC)(32M[MXZ]|[0-9]+[A-Z])([A-Z0-9]+)$")
     set(MICROCHIP_MCU_FAMILY "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
     set(MICROCHIP_MCU_MODEL  "${CMAKE_MATCH_2}${CMAKE_MATCH_3}")