diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberAction.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberAction.java
index 25ba11aa..32f0e39b 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberAction.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberAction.java
@@ -87,7 +87,7 @@ public void actionPerformed(ActionEvent e) {
 	private AbstractSourceTree createTree() {
 		AbstractSourceTree tree = null;
 		try {
-			tree = (AbstractSourceTree)outlineTreeClass.newInstance();
+			tree = (AbstractSourceTree)outlineTreeClass.getDeclaredConstructor().newInstance();
 			tree.setSorted(true);
 		} catch (RuntimeException re) { // FindBugs
 			throw re;
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
index e198ef82..a487ea28 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
@@ -143,7 +143,7 @@ public LanguageSupport getSupportFor(String style) {
 			if (supportClazz!=null) {
 				try {
 					Class<?> clazz = Class.forName(supportClazz);
-					support = (LanguageSupport)clazz.newInstance();
+					support = (LanguageSupport)clazz.getDeclaredConstructor().newInstance();
 				} catch (RuntimeException re) { // FindBugs
 					throw re;
 				} catch (Exception e) {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaLanguageSupport.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaLanguageSupport.java
index f985fbed..1a519c67 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaLanguageSupport.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaLanguageSupport.java
@@ -176,7 +176,7 @@ private void installKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift), "GoToType");
@@ -221,7 +221,7 @@ private void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift));
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageSupport.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageSupport.java
index 6d093d5b..024ce9eb 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageSupport.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageSupport.java
@@ -314,7 +314,7 @@ private void installKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift), "GoToType");
@@ -514,7 +514,7 @@ private void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift));
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/SourceCompletionProvider.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/SourceCompletionProvider.java
index 8a16e197..4935cf2e 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/SourceCompletionProvider.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/SourceCompletionProvider.java
@@ -123,7 +123,7 @@ public void setShorthandCache(ShorthandCompletionCache shorthandCache) {
 	@Override
 	public List<Completion> getCompletionsAt(JTextComponent tc, Point p) {
 
-		int offset = tc.viewToModel(p);
+		int offset = tc.viewToModel2D(p);
 		if (offset<0 || offset>=tc.getDocument().getLength()) {
 			lastCompletionsAtText = null;
 			return lastParameterizedCompletionsAt = null;
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/ast/type/TypeDeclarationFactory.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/ast/type/TypeDeclarationFactory.java
index cdc7a9fe..25c4431e 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/ast/type/TypeDeclarationFactory.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/ast/type/TypeDeclarationFactory.java
@@ -46,7 +46,7 @@ public List<String> setTypeDeclarationVersion(String ecmaVersion,
 			ecmaVersion = ecmaVersion == null ? getDefaultECMAVersion() : ecmaVersion;
 			//try to instantiate classes
 			Class<?> ecmaClass = TypeDeclarationFactory.class.getClassLoader().loadClass(ecmaVersion);
-		 	ecma = (TypeDeclarations) ecmaClass.newInstance();
+		 	ecma = (TypeDeclarations) ecmaClass.getDeclaredConstructor().newInstance();
 		}
 		catch(Exception e)
 		{
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/XmlLanguageSupport.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/XmlLanguageSupport.java
index 8e577b46..2b41ae9d 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/XmlLanguageSupport.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/XmlLanguageSupport.java
@@ -170,7 +170,7 @@ protected void installKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift), "GoToType");
@@ -227,7 +227,7 @@ protected void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {
 
 		InputMap im = textArea.getInputMap();
 		ActionMap am = textArea.getActionMap();
-		int c = textArea.getToolkit().getMenuShortcutKeyMask();
+		int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
 		int shift = InputEvent.SHIFT_DOWN_MASK;
 
 		im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift));