diff --git a/include/Nazara/Widgets/TextAreaWidget.hpp b/include/Nazara/Widgets/TextAreaWidget.hpp
index f7025e148..7331c1ecd 100644
--- a/include/Nazara/Widgets/TextAreaWidget.hpp
+++ b/include/Nazara/Widgets/TextAreaWidget.hpp
@@ -65,6 +65,7 @@ namespace Nz
 			void HandleIndentation(bool add) override;
 			void HandleSelectionIndentation(bool add) override;
 			void HandleWordCursorMove(bool left) override;
+			void HandleWordSelection(const Vector2ui& position) override;
 
 			void PasteFromClipboard(const Vector2ui& targetPosition) override;
 
diff --git a/src/Nazara/Widgets/AbstractTextAreaWidget.cpp b/src/Nazara/Widgets/AbstractTextAreaWidget.cpp
index 89bf790aa..d3430faab 100644
--- a/src/Nazara/Widgets/AbstractTextAreaWidget.cpp
+++ b/src/Nazara/Widgets/AbstractTextAreaWidget.cpp
@@ -323,6 +323,7 @@ namespace Nz
 			}
 
 			case Keyboard::VKey::Return:
+			case Keyboard::VKey::NumpadReturn:
 			{
 				bool ignoreDefaultAction = false;
 				OnTextAreaKeyReturn(this, &ignoreDefaultAction);
diff --git a/xmake.lua b/xmake.lua
index 5d06794c8..fbee8a345 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -151,7 +151,7 @@ if is_plat("windows") then
 	set_runtimes(is_mode("debug") and "MDd" or "MD")
 
 	add_defines("_CRT_SECURE_NO_WARNINGS")
-	add_cxxflags("/bigobj", "/permissive-", "/Zc:__cplusplus", "/Zc:referenceBinding", "/Zc:throwingNew")
+	add_cxxflags("/bigobj", "/permissive-", "/Zc:__cplusplus", "/Zc:externConstexpr", "/Zc:inline", "/Zc:lambda", "/Zc:preprocessor", "/Zc:referenceBinding", "/Zc:strictStrings", "/Zc:throwingNew")
 	add_cxflags("/w44062") -- Enable warning: switch case not handled
 	add_cxflags("/wd4251") -- Disable warning: class needs to have dll-interface to be used by clients of class blah blah blah
 elseif is_plat("mingw") then