diff --git a/CMakeLists.txt b/CMakeLists.txt
index be89d368..068a4b27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.16.3)
 project(Elastix)
 
+if(NOT CMAKE_CXX_STANDARD)
+  # SuperElastix/elastix uses C++17 specific features in some of its header files.
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+
 # To ease enablement with Python packaging
 if(DEFINED ENV{ELASTIX_USE_OPENCL})
   set(ELASTIX_USE_OPENCL ON CACHE BOOL "Enable OpenCL support in Elastix")
@@ -51,7 +56,7 @@ if(SKBUILD)
 endif()
 
 set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
-set(elastix_GIT_TAG "d652938573e5f193955908eba225a854b31ce36a")
+set(elastix_GIT_TAG "b9b8e20aef83f94ed38a81cc38625a1bfddf1053")
 FetchContent_Declare(
   elx
   GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
diff --git a/wrapping/itkElastixRegistrationMethod.wrap b/wrapping/itkElastixRegistrationMethod.wrap
index 16ade0ce..322fbf7d 100644
--- a/wrapping/itkElastixRegistrationMethod.wrap
+++ b/wrapping/itkElastixRegistrationMethod.wrap
@@ -1,4 +1,4 @@
 itk_wrap_class("itk::ElastixRegistrationMethod" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_REAL}" 2)
+  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2)
 itk_end_wrap_class()
 
diff --git a/wrapping/itkTransformixFilter.wrap b/wrapping/itkTransformixFilter.wrap
index cb63e809..9c8bc12e 100644
--- a/wrapping/itkTransformixFilter.wrap
+++ b/wrapping/itkTransformixFilter.wrap
@@ -1,4 +1,4 @@
 itk_wrap_class("itk::TransformixFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_REAL}" 1)
+  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 1)
 itk_end_wrap_class()