diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 3397eb7..ee12036 100755
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -45,18 +45,8 @@ else()
   set(XED_HOST_CPU "")
 endif()
 
-# Attempt to fix building XED on VS2022 and later
-# Because having a custom build system is just awesome :-/
-if(MSVC_VERSION AND (MSVC_VERSION GREATER 1929))
-  get_filename_component(VS_BIN_PATH "${CMAKE_C_COMPILER}" DIRECTORY)
-  set(VS_LIB_EXE "${VS_BIN_PATH}/lib.exe")
-  set(XED_ADDITONAL_FLAGS --cc ${CMAKE_C_COMPILER} --cxx ${CMAKE_CXX_COMPILER} --linker ${CMAKE_LINKER} --ar ${VS_LIB_EXE})
-else()
-  set(XED_ADDITONAL_FLAGS "")
-endif()
-
 set (BUILD_XED_COMMAND
-     ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU} ${XED_ADDITONAL_FLAGS}
+     ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU}
 )
 
 if (WIN32)
diff --git a/third_party/mbuild b/third_party/mbuild
index 03ee9d5..b414859 160000
--- a/third_party/mbuild
+++ b/third_party/mbuild
@@ -1 +1 @@
-Subproject commit 03ee9d52adb7f01d476ced0dba1534cfc7edff36
+Subproject commit b41485956bf65d51b8c2379768de7eaaa7a4245b