diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e6f125..58f647f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 # backbase-services-toolkit Changelog
 
 ## [Unreleased]
+### Update
+- Minor fixes
 
 ## [0.0.4]
 ### Update
diff --git a/gradle.properties b/gradle.properties
index 6652eb1..98780e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ pluginVersion = 0.0.5
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 203
-pluginUntilBuild = 213.*
+pluginUntilBuild = 223.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
diff --git a/src/main/kotlin/com/backbase/bst/actions/ConsumeEventAction.kt b/src/main/kotlin/com/backbase/bst/actions/ConsumeEventAction.kt
index 759001f..2a923dd 100644
--- a/src/main/kotlin/com/backbase/bst/actions/ConsumeEventAction.kt
+++ b/src/main/kotlin/com/backbase/bst/actions/ConsumeEventAction.kt
@@ -138,7 +138,7 @@ class ConsumeEventAction : DumbAwareAction() {
 
         val eventArtifact = MavenId("com.backbase.buildingblocks", "events", "")
 
-        if(file != null && project !=null  && !MavenTools.findDependencyOnBom(project, file, eventArtifact)){
+        if(file == null || project ==null  || !MavenTools.findDependencyOnBom(project, file, eventArtifact)){
             e.presentation.isVisible = false
             return
         }
diff --git a/src/main/kotlin/com/backbase/bst/wizard/SsdkStep.kt b/src/main/kotlin/com/backbase/bst/wizard/SsdkStep.kt
index 732f1d0..2369a28 100644
--- a/src/main/kotlin/com/backbase/bst/wizard/SsdkStep.kt
+++ b/src/main/kotlin/com/backbase/bst/wizard/SsdkStep.kt
@@ -42,7 +42,8 @@ class SsdkStep(
         row {
             cell(isFullWidth = true) {
                 label("SSDK Version")
-                comboBox(DefaultComboBoxModel(ssdkVersions.toTypedArray()),
+                comboBox(
+                    DefaultComboBoxModel(ssdkVersions.toTypedArray()),
                     projectId::ssdkVersion)
             }
         }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index fc5c47e..5660100 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,8 @@
     <description><![CDATA[ Description will be added by gradle build]]></description>
     <actions>
         <group id="ProjectViewPopupBackbaseMenu" text="Backbase" popup="true" icon="/icons/bb-horizontal16.svg">
-            <add-to-group group-id="ProjectViewPopupMenu" anchor="first"/>
+            <add-to-group group-id="ProjectViewPopupMenu" anchor="after"
+                          relative-to-action="WeighingNewGroup"/>
         </group>
 
         <action id="actions.SearchGithubAction" class="com.backbase.bst.actions.SearchGoldenSamplesAction" text="Search Golden Samples"