diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java
index 31dfce5e6b6e84f72dc3c00053171a6545332041..6694e0c86712f4f900f334af3159db559630b7a4 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java
@@ -115,7 +115,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
     {
         implType.checkObjectClass(IDataTransferNode.class);
         try {
-            return implType.getObjectClass(IDataTransferNode.class).newInstance();
+            return implType.getObjectClass(IDataTransferNode.class).getDeclaredConstructor().newInstance();
         } catch (Throwable e) {
             throw new DBException("Can't create data transformer node", e);
         }
@@ -125,7 +125,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
     {
         settingsType.checkObjectClass(IDataTransferSettings.class);
         try {
-            return settingsType.getObjectClass(IDataTransferSettings.class).newInstance();
+            return settingsType.getObjectClass(IDataTransferSettings.class).getDeclaredConstructor().newInstance();
         } catch (Throwable e) {
             throw new DBException("Can't create node settings", e);
         }
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java
index 5d23831db614f98c229f8b0f9b11f6997b5daa21..155c779845f3d742aaa3920ff7812ecd27961836 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java
@@ -89,7 +89,7 @@ public class GenericMetaModelDescriptor extends AbstractDescriptor {
             throw new DBException("Can't create generic meta model instance '" + implType.getImplName() + "'");
         }
         try {
-            instance = implClass.newInstance();
+            instance = implClass.getDeclaredConstructor().newInstance();
         } catch (Throwable e) {
             throw new DBException("Can't instantiate meta model", e);
         }
diff --git a/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java b/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
index 05e211bf9a90516aee4634693e7a1434c1a96595..7c0a246cab739308b9f87f182c2adfac4f298daa 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
+++ b/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
@@ -18,6 +18,7 @@
 
 package org.jkiss.dbeaver.ext.mysql.tools;
 
+import org.eclipse.jface.wizard.IWizardPage;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.ext.mysql.tasks.MySQLScriptExecuteSettings;
 import org.jkiss.dbeaver.ext.mysql.tasks.MySQLTasks;
@@ -32,7 +33,7 @@ import java.util.Map;
 
 class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptExecuteSettings, MySQLCatalog, MySQLCatalog> {
 
-    private MySQLScriptExecuteWizardPageSettings mainPage = new MySQLScriptExecuteWizardPageSettings(this);
+    private MySQLScriptExecuteWizardPageSettings settingsPage = new MySQLScriptExecuteWizardPageSettings(this);
 
     MySQLScriptExecuteWizard(MySQLCatalog catalog, boolean isImport) {
         super(Collections.singleton(catalog), isImport ? MySQLUIMessages.tools_script_execute_wizard_db_import : MySQLUIMessages.tools_script_execute_wizard_execute_script);
@@ -51,7 +52,7 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
 
     @Override
     public void saveTaskState(DBRRunnableContext runnableContext, Map<String, Object> state) {
-        mainPage.saveState();
+        settingsPage.saveState();
         getSettings().saveSettings(runnableContext, new TaskPreferenceStore(state));
     }
 
@@ -76,8 +77,16 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
     @Override
     public void addPages() {
         addTaskConfigPages();
-        addPage(mainPage);
+        addPage(settingsPage);
         super.addPages();
     }
 
+    @Override
+    public IWizardPage getNextPage(IWizardPage page) {
+        if (page == settingsPage) {
+            return null;
+        }
+        return super.getNextPage(page);
+    }
+
 }
diff --git a/plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java b/plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
index 0bafdce3fed9fadffa7914159fab545624ea8784..447bb0a722b23d044de3166e29a4d0e2eab6d9db 100644
--- a/plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
+++ b/plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
@@ -34,7 +34,7 @@ public class SCMENumber extends SCMLeafNode {
     }
 
     public Number getNumberValue() {
-        return new Double(getPlainValue());
+        return Double.parseDouble(getPlainValue());
     }
 
 }
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
index e39efd1877d1a590388d860c0f8eafd8f4858db3..638512d3a4403bfb59f1a5b49c2b11e5c55e9781 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
@@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.utils.CommonUtils;
 import org.osgi.framework.Bundle;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -191,8 +192,8 @@ public abstract class AbstractDescriptor {
                 throw new DBException("Can't load class '" + getImplName() + "'");
             }
             try {
-                return objectClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                return objectClass.getDeclaredConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                 throw new DBException("Can't instantiate class '" + getImplName() + "'", e);
             }
         }
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java
index d926cb126932ea174032fdc53553451415356224..dc5c37888da25677685d15ae9750b15dfec724aa 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java
@@ -172,7 +172,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
             props.putDouble(name, value);
         }
         dirty = true;
-        firePropertyChangeEvent(name, new Double(oldValue), new Double(value));
+        firePropertyChangeEvent(name, oldValue, value);
     }
 
     @Override
@@ -187,7 +187,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
             props.putFloat(name, value);
         }
         dirty = true;
-        firePropertyChangeEvent(name, new Float(oldValue), new Float(value));
+        firePropertyChangeEvent(name, oldValue, value);
     }
 
     @Override
@@ -202,7 +202,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
             props.putInt(name, value);
         }
         dirty = true;
-        firePropertyChangeEvent(name, new Integer(oldValue), new Integer(value));
+        firePropertyChangeEvent(name, oldValue, value);
     }
 
     @Override
@@ -217,7 +217,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
             props.putLong(name, value);
         }
         dirty = true;
-        firePropertyChangeEvent(name, new Long(oldValue), new Long(value));
+        firePropertyChangeEvent(name, oldValue, value);
     }
 
     @Override
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java
index 5a3eb471a68cc196e29b1c48827159a10a2c419d..5ef4a17498d00188fb00b4dd2117e3a414446fbf 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java
@@ -59,7 +59,7 @@ public class DataFormatterDescriptor extends AbstractDescriptor
         }
         Class<?> objectClass = getObjectClass(config.getAttribute("sampleClass"));
         try {
-            sample = (DBDDataFormatterSample)objectClass.newInstance();
+            sample = (DBDDataFormatterSample)objectClass.getDeclaredConstructor().newInstance();
         } catch (Exception e) {
             log.error("Can't instantiate data formatter '" + getId() + "' sample");
         }
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java b/plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
index 151568bee22e2ffdb2fc9f0722f7724746f3f4c7..61e19196cf8e941443306a3c4c8bf1d642e60b42 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
+++ b/plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
@@ -1,12 +1,12 @@
 package org.jkiss.dbeaver.model.net.ssh;
 
-import java.util.List;
-import java.util.Vector;
-
 import com.jcraft.jsch.Buffer;
 import com.jcraft.jsch.IdentityRepository;
 import com.jcraft.jsch.JSchException;
 
+import java.util.List;
+import java.util.Vector;
+
 public class DBeaverIdentityRepository implements IdentityRepository {
     
     private SSHImplementationAbstract impl;
@@ -18,7 +18,7 @@ public class DBeaverIdentityRepository implements IdentityRepository {
     }
 
     @Override
-    public Vector getIdentities() {
+    public Vector<?> getIdentities() {
         Vector<com.jcraft.jsch.Identity> result = new Vector<com.jcraft.jsch.Identity>(); 
 
         for (SSHAgentIdentity identity : identities) {
diff --git a/plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java b/plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
index f93c471bad4630be483778eaee7a19e2f8bbc891..1f82dce74c802b0cc1c7f383ee9208b7606e6f41 100644
--- a/plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
+++ b/plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
@@ -18,26 +18,14 @@
 
 package org.jkiss.dbeaver.team.git.ui;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Plugin;
-import org.jkiss.dbeaver.Log;
 import org.osgi.framework.BundleContext;
 
 public class Activator extends Plugin {
     
-    //private static final Log log = Log.getLog(Activator.class);
-
-
-    @Override
-    public void startup() throws CoreException {
-        //super.startup();
-        //log.info("Activator git startup");
-    }
-
     @Override
     public void start(BundleContext context) throws Exception {
-        //super.start(context);
-        //log.info("Activator git start");
+        super.start(context);
     }
 
 }