diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 641ede8c6c2..801b5f739fd 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="134.1160" until-build="134.1170"/>
+  <idea-version since-build="134.1160" until-build="134.1345"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt b/idea/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt
index 07d9a924c9f..23c12df83d8 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt
@@ -39,23 +39,23 @@ class ModuleTypeCacheManager private (project: Project) {
             val connection = project.getMessageBus().connect();
             connection.subscribe(VirtualFileManager.VFS_CHANGES, BulkVirtualFileListenerAdapter(
                     object : VirtualFileAdapter() {
-                        override fun propertyChanged(event: VirtualFilePropertyEvent?) {
+                        override fun propertyChanged(event: VirtualFilePropertyEvent) {
                             incModificationCount()
                         }
 
-                        override fun fileCreated(event: VirtualFileEvent?) {
+                        override fun fileCreated(event: VirtualFileEvent) {
                             incModificationCount()
                         }
 
-                        override fun fileDeleted(event: VirtualFileEvent?) {
+                        override fun fileDeleted(event: VirtualFileEvent) {
                             incModificationCount()
                         }
 
-                        override fun fileMoved(event: VirtualFileMoveEvent?) {
+                        override fun fileMoved(event: VirtualFileMoveEvent) {
                             incModificationCount()
                         }
 
-                        override fun fileCopied(event: VirtualFileCopyEvent?) {
+                        override fun fileCopied(event: VirtualFileCopyEvent) {
                             incModificationCount()
                         }
                     }
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
index 2d41d488da3..6e29f3f6430 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
@@ -83,7 +83,7 @@ public final class K2JSRunnerUtils {
         String filePath = configurationSettings.getPageToOpenFilePath();
         String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath);
 
-        WebBrowser browser = WebBrowserManager.getInstance().findBrowser(configurationSettings.getBrowserFamily());
+        WebBrowser browser = WebBrowserManager.getInstance().findBrowserById(configurationSettings.getBrowserFamily().getName());
         BrowserLauncher.getInstance().browse(url, browser);
     }
 
diff --git a/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java b/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java
index 65fe81e5b49..10d83aaf77c 100644
--- a/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java
+++ b/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java
@@ -1,6 +1,6 @@
 import org.jetbrains.annotations.NotNull;
 
-public class Small {
+class Small {
     void test(@NotNull String hi) {
     }
 }
diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
index 2ea8eea4c4a..abb7da62ccb 100644
--- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
@@ -33,7 +33,7 @@ import java.net.URLClassLoader
 import java.util.HashSet
 
 public object JavaToKotlinTranslator {
-    private val DISPOSABLE: Disposable? = Disposer.newDisposable()
+    private val DISPOSABLE = Disposer.newDisposable()
 
     private fun createFile(text: String): PsiFile? {
         val javaCoreEnvironment: JavaCoreProjectEnvironment? = setUpJavaCoreEnvironment()
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 60380148dd1..fe22d6c286d 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="2376640"/>
-    <property name="public.buildserver.build.id" value="116034"/>
+    <property name="jb.buildserver.build.id" value="2394255"/>
+    <property name="public.buildserver.build.id" value="118313"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />