diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExperiment.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExperiment.kt
index 173cae19f7..c044309b82 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExperiment.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExperiment.kt
@@ -6,7 +6,7 @@ package software.aws.toolkits.jetbrains.core.execution
 import software.aws.toolkits.jetbrains.core.experiments.ToolkitExperiment
 import software.aws.toolkits.resources.message
 
-object PythonAwsConnectionExperiment : ToolkitExperiment(
+class PythonAwsConnectionExperiment : ToolkitExperiment(
     "pythonRunConfigurationExtension",
     { message("run_configuration_extension.feature.python.title") },
     { message("run_configuration_extension.feature.python.description") },
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt
index 51b1b76091..fa456557ef 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt
@@ -81,5 +81,5 @@ class OpenAwsLocalTerminal : DumbAwareAction(
     }
 }
 
-object AwsLocalTerminalExperiment :
+class AwsLocalTerminalExperiment :
     ToolkitExperiment("connectedLocalTerminal", { message("aws.terminal.action") }, { message("aws.terminal.action.tooltip") }, default = true)
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/JsonResourceModificationExperiment.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/JsonResourceModificationExperiment.kt
index 3532cf96a9..4ba7a7b15d 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/JsonResourceModificationExperiment.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/JsonResourceModificationExperiment.kt
@@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.core.experiments.ToolkitExperimentStateCh
 import software.aws.toolkits.jetbrains.core.experiments.suggest
 import software.aws.toolkits.resources.message
 
-object JsonResourceModificationExperiment : ToolkitExperiment(
+class JsonResourceModificationExperiment : ToolkitExperiment(
     "jsonResourceModification",
     { message("dynamic_resources.experiment.title") },
     { message("dynamic_resources.experiment.description") }
@@ -22,7 +22,7 @@ object JsonResourceModificationExperiment : ToolkitExperiment(
 class SuggestEditExperimentListener : FileEditorManagerListener {
     override fun fileOpened(source: FileEditorManager, file: VirtualFile) {
         if (file is DynamicResourceVirtualFile) {
-            JsonResourceModificationExperiment.suggest()
+            JsonResourceModificationExperiment().suggest()
         }
     }
 }
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExecExperiment.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExecExperiment.kt
index 1b329f1a4b..4f2fad46e6 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExecExperiment.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExecExperiment.kt
@@ -6,7 +6,7 @@ package software.aws.toolkits.jetbrains.services.ecs
 import software.aws.toolkits.jetbrains.core.experiments.ToolkitExperiment
 import software.aws.toolkits.resources.message
 
-object EcsExecExperiment : ToolkitExperiment(
+class EcsExecExperiment : ToolkitExperiment(
     "ecsExec",
     { message("ecs.execute_command.experiment.title") },
     { message("ecs.execute_command.experiment.description") },
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt
index 4ea4eaa5bd..62c742252f 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt
@@ -28,7 +28,7 @@ import java.nio.file.Path
 import java.time.Duration
 import kotlin.streams.asSequence
 
-object SsmPlugin : ManagedToolType<FourPartVersion>, DocumentedToolType<FourPartVersion>, BaseToolType<FourPartVersion>() {
+class SsmPlugin : ManagedToolType<FourPartVersion>, DocumentedToolType<FourPartVersion>, BaseToolType<FourPartVersion>() {
     private val hasDpkg by lazy { hasCommand("dpkg-deb") }
     private val hasRpm2Cpio by lazy { hasCommand("rpm2cpio") }
 
@@ -133,9 +133,12 @@ object SsmPlugin : ManagedToolType<FourPartVersion>, DocumentedToolType<FourPart
         val output = ExecUtil.execAndGetOutput(GeneralCommandLine("sh", "-c", "command -v $cmd"), EXECUTION_TIMEOUT.toMillis().toInt())
         return output.exitCode == 0
     }
-    private val LOGGER = getLogger<SsmPlugin>()
-    private const val BASE_URL = "https://s3.us-east-1.amazonaws.com/session-manager-downloads/plugin"
-    private const val VERSION_FILE = "$BASE_URL/latest/VERSION"
-    private val EXECUTION_TIMEOUT = Duration.ofSeconds(5)
-    private val INSTALL_TIMEOUT = Duration.ofSeconds(30)
+
+    companion object {
+        private val LOGGER = getLogger<SsmPlugin>()
+        private const val BASE_URL = "https://s3.us-east-1.amazonaws.com/session-manager-downloads/plugin"
+        private const val VERSION_FILE = "$BASE_URL/latest/VERSION"
+        private val EXECUTION_TIMEOUT = Duration.ofSeconds(5)
+        private val INSTALL_TIMEOUT = Duration.ofSeconds(30)
+    }
 }