diff --git a/src/SelfServe/SqlX/SqlX.tsx b/src/SelfServe/SqlX/SqlX.tsx
index fe08a5c62..a532c5244 100644
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -177,7 +177,7 @@ export default class SqlX extends SelfServeBaseClass {
     currentValues: Map<string, SmartUiInput>,
     baselineValues: Map<string, SmartUiInput>
   ): Promise<OnSaveResult> => {
-    selfServeTrace({ selfServeClassName: this.constructor.name });
+    selfServeTrace({ selfServeClassName: SqlX.name });
 
     const dedicatedGatewayCurrentlyEnabled = currentValues.get("enableDedicatedGateway")?.value as boolean;
     const dedicatedGatewayOriginallyEnabled = baselineValues.get("enableDedicatedGateway")?.value as boolean;
diff --git a/webpack.config.js b/webpack.config.js
index 1c5f8193c..f21f310c8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -220,7 +220,10 @@ module.exports = function (env = {}, argv = {}) {
           terserOptions: {
             // These options increase our initial bundle size by ~5% but the builds are significantly faster and won't run out of memory
             compress: false,
-            mangle: true,
+            mangle: {
+              keep_fnames: true,
+              keep_classnames: true,
+            },
           },
         }),
       ],