diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
index 7356eeca682..a263853789e 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java
@@ -237,8 +237,9 @@ public Boolean run() {
     }
 
     @SuppressWarnings("removal")
-    @Override public boolean handleKeyEvent(View view, long time, int type, int key,
-                                         char[] chars, int modifiers)
+    @Override
+    public boolean handleKeyEvent(View view, long time, int type, int key,
+                                  char[] chars, int modifiers)
     {
         keyNotification.view = view;
         keyNotification.time = time;
@@ -247,7 +248,7 @@ public Boolean run() {
         keyNotification.chars = chars;
         keyNotification.modifiers = modifiers;
 
-        final boolean consumed = QuantumToolkit.runWithoutRenderLock(() -> {
+        boolean consumed = QuantumToolkit.runWithoutRenderLock(() -> {
             return AccessController.doPrivileged(keyNotification, scene.getAccessControlContext());
         });
         return consumed;
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
index eadb8721b71..317c90c9bdc 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.h
@@ -54,7 +54,7 @@
     BOOL didCommitText;
     BOOL isHiDPIAware;
 
-    NSEvent             *lastKeyEvent;
+    NSEvent *lastKeyEvent;
 }
 
 - (id)initWithFrame:(NSRect)frame withJview:(jobject)jView withJproperties:(jobject)jproperties;
diff --git a/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java b/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java
index 6a9831b1a75..e94b491610c 100644
--- a/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java
+++ b/tests/system/src/test/java/test/robot/javafx/scene/MenuDoubleShortcutTest.java
@@ -55,7 +55,6 @@ public class MenuDoubleShortcutTest {
 
     static CountDownLatch startupLatch = new CountDownLatch(1);
 
-    static volatile Stage stage;
     static volatile TestApp testApp;
     static private final int delayMilliseconds = 100;
 
@@ -164,10 +163,9 @@ private MenuItem createMenuItem(KeyCombination accelerator) {
         }
 
         @Override
-        public void start(Stage primaryStage) {
+        public void start(Stage stage) {
 
             testApp = this;
-            stage = primaryStage;
 
             Label label = new Label("Testing accelerator double processing");