diff --git a/CMakeLists.txt b/CMakeLists.txt
index af209c86..8edd07da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ include(CheckCXXSourceCompiles)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index bbadcdf2..ceadf97f 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -22,6 +22,8 @@ class Matrix4 {
 	// FUNCTION: BETA10 0x1000fc70
 	Matrix4(float (*p_data)[4]) { SetData(p_data); }
 
+	virtual ~Matrix4() {}
+
 	inline virtual void Equals(float (*p_data)[4]);                                           // vtable+0x04
 	inline virtual void Equals(const Matrix4& p_matrix);                                      // vtable+0x00
 	inline virtual void SetData(float (*p_data)[4]);                                          // vtable+0x0c