diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index d6a883158..7bd0ba8c7 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -848,12 +848,7 @@ void
 XWindowsScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
 {
 	// FIXME -- ignore xinerama for now
-	// 	if (false && m_xinerama && m_xtestIsXineramaUnaware) {
-	// 		XWarpPointer(m_display, None, m_root, 0, 0, 0, 0, x, y);
-	// 	}
-	// 	else {
 	XTestFakeRelativeMotionEvent(m_display, dx, dy, CurrentTime);
-	// }
 	XFlush(m_display);
 }
 
diff --git a/src/test/unittests/synergy/ArgParserTests.cpp b/src/test/unittests/synergy/ArgParserTests.cpp
index b7d3b6df1..b35e39340 100644
--- a/src/test/unittests/synergy/ArgParserTests.cpp
+++ b/src/test/unittests/synergy/ArgParserTests.cpp
@@ -220,12 +220,12 @@ TEST(ArgParserTests, parseToolArgs_matches_correspondingly)
     for (auto const &test: tests) {
         ToolArgs toolArgs;
         EXPECT_FALSE(test.second(toolArgs));
-        const char *twoArgs[2] {"syntool", test.first};
-        EXPECT_TRUE(parser.parseToolArgs(toolArgs, 2, twoArgs));
+        std::array<const char *, 2> twoArgs {"syntool", test.first};
+        EXPECT_TRUE(parser.parseToolArgs(toolArgs, 2, twoArgs.data()));
         EXPECT_TRUE(test.second(toolArgs));
     }
     ToolArgs toolArgs;
-    const char *twoArgs[2] {"syntool", "--garbage"};
-    EXPECT_FALSE(parser.parseToolArgs(toolArgs, 2, twoArgs));
+    std::array<const char *, 2> twoArgs {"syntool", "--garbage"};
+    EXPECT_FALSE(parser.parseToolArgs(toolArgs, 2, twoArgs.data()));
 }