diff --git a/src/main/kotlin/com/jetbrains/snakecharm/codeInsight/completion/wrapper/SmkWrapperArgsCompletionProvider.kt b/src/main/kotlin/com/jetbrains/snakecharm/codeInsight/completion/wrapper/SmkWrapperArgsCompletionProvider.kt
index ce7ab18a..aa149da1 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/codeInsight/completion/wrapper/SmkWrapperArgsCompletionProvider.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/codeInsight/completion/wrapper/SmkWrapperArgsCompletionProvider.kt
@@ -51,7 +51,7 @@ object SmkWrapperArgsCompletionProvider : CompletionProvider<CompletionParameter
 
         val wrapperSection = containingRuleLike?.getSectionByName(SnakemakeNames.SECTION_WRAPPER) ?: return
 
-        val wrappers = SmkWrapperStorage.getInstance(parameters.position.project)?.wrappers ?: return
+        val wrappers = SmkWrapperStorage.getInstance(parameters.position.project).wrappers
 
         val wrapperFstArg = wrapperSection.argumentList?.arguments?.firstOrNull()
         if (wrapperFstArg !is PyStringLiteralExpression) {
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkMultilineFunctionCallInspection.kt b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkMultilineFunctionCallInspection.kt
index 9bfccbe6..632ea8b1 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkMultilineFunctionCallInspection.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkMultilineFunctionCallInspection.kt
@@ -6,7 +6,7 @@ import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.psi.util.elementType
-import com.intellij.refactoring.suggested.startOffset
+import com.intellij.psi.util.startOffset
 import com.jetbrains.python.PyTokenTypes
 import com.jetbrains.python.psi.PyCallExpression
 import com.jetbrains.snakecharm.SnakemakeBundle
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkSeveralRulesAreOverriddenAsOneInspection.kt b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkSeveralRulesAreOverriddenAsOneInspection.kt
index 3a1e892d..c0ee92cb 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkSeveralRulesAreOverriddenAsOneInspection.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkSeveralRulesAreOverriddenAsOneInspection.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
-import com.intellij.refactoring.suggested.endOffset
+import com.intellij.psi.util.endOffset
 import com.jetbrains.snakecharm.SnakemakeBundle
 import com.jetbrains.snakecharm.lang.psi.SmkUse
 
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnusedLogFileInspection.kt b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnusedLogFileInspection.kt
index 2f5e6211..a6b42fd1 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnusedLogFileInspection.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnusedLogFileInspection.kt
@@ -7,9 +7,9 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.util.endOffset
 import com.intellij.psi.util.parentOfType
-import com.intellij.refactoring.suggested.endOffset
-import com.intellij.refactoring.suggested.startOffset
+import com.intellij.psi.util.startOffset
 import com.jetbrains.python.psi.PyBinaryExpression
 import com.jetbrains.python.psi.PyStringElement
 import com.jetbrains.python.psi.PyStringLiteralExpression
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkWrapperMissedArgumentsInspection.kt b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkWrapperMissedArgumentsInspection.kt
index 2ac6f502..99121078 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkWrapperMissedArgumentsInspection.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkWrapperMissedArgumentsInspection.kt
@@ -30,8 +30,7 @@ class SmkWrapperMissedArgumentsInspection : SnakemakeInspection() {
         fun visitSmkRuleOrCheckpoint(ruleOrCheckpoint: SmkRuleOrCheckpoint) {
             val wrapper = ruleOrCheckpoint.getSectionByName(SnakemakeNames.SECTION_WRAPPER) ?: return
 
-            val wrappers = SmkWrapperStorage.getInstance(ruleOrCheckpoint.project)
-                ?.wrappers ?: return
+            val wrappers = SmkWrapperStorage.getInstance(ruleOrCheckpoint.project).wrappers
             val wrapperName = wrapper.argumentList?.text ?: return
             val wrapperInfo = wrappers.find { wrapperName.contains(it.path) } ?: return
 
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/lang/documentation/SmkWrapperDocumentation.kt b/src/main/kotlin/com/jetbrains/snakecharm/lang/documentation/SmkWrapperDocumentation.kt
index f1bebb2c..fbc88db8 100644
--- a/src/main/kotlin/com/jetbrains/snakecharm/lang/documentation/SmkWrapperDocumentation.kt
+++ b/src/main/kotlin/com/jetbrains/snakecharm/lang/documentation/SmkWrapperDocumentation.kt
@@ -32,8 +32,7 @@ class SmkWrapperDocumentation : AbstractDocumentationProvider() {
         } else {
             text.substringAfter("/")
         }
-        val wrappers = SmkWrapperStorage.getInstance(node.navigationElement.project)
-                ?.wrappers ?: return ""
+        val wrappers = SmkWrapperStorage.getInstance(node.navigationElement.project).wrappers
         val wrapper =  wrappers.find { wrapper -> wrapper.path.contains(result) }
         if (text.startsWith("file://")) {
             return if (wrapper != null)