diff --git a/src/log/logd/lgs.h b/src/log/logd/lgs.h
index 7ddb68ccd..635948a3b 100644
--- a/src/log/logd/lgs.h
+++ b/src/log/logd/lgs.h
@@ -80,6 +80,9 @@
   2 /* Store logs on local file system on \
        each node */
 
+// [Lennart] Use Google style guide naming
+// Should be: kImmVersion
+// [Lennart] Add constant for AMF version
 const SaVersionT KImmVersion = {'A', 02, 11};
 
 /* ========================================================================
diff --git a/src/log/logd/lgs_amf.cc b/src/log/logd/lgs_amf.cc
index 25eedc25b..6c65393b3 100644
--- a/src/log/logd/lgs_amf.cc
+++ b/src/log/logd/lgs_amf.cc
@@ -457,6 +457,7 @@ SaAisErrorT lgs_amf_init(lgs_cb_t *cb) {
   amfCallbacks.saAmfComponentTerminateCallback = amf_comp_terminate_callback;
   amfCallbacks.saAmfCSIRemoveCallback = amf_csi_rmv_callback;
 
+  // [Lennart] Problem not fixed here. Handle in the same way as IMM version
   amf_version = {'B', 0x01, 0x01};
   /* Initialize the AMF library */
   error = saAmfInitialize(&cb->amf_hdl, &amfCallbacks, &amf_version);
diff --git a/src/log/logd/lgs_clm.cc b/src/log/logd/lgs_clm.cc
index 2e2859257..031d6b532 100644
--- a/src/log/logd/lgs_clm.cc
+++ b/src/log/logd/lgs_clm.cc
@@ -24,6 +24,8 @@
 static bool clm_initialized;
 static void *clm_node_db = NULL; /* used for C++ STL map */
 typedef std::map<NODE_ID, lgs_clm_node_t *> ClmNodeMap;
+// [Lennart] Follow Google style guide. Define constant
+// in the same place as IMM version and AMF version (lgs.h)
 const SaVersionT KClmVersion = {'B', 0x04, 0x01};
 
 /**
diff --git a/src/log/logd/lgs_config.cc b/src/log/logd/lgs_config.cc
index ad773d8f0..fd4a71f0a 100644
--- a/src/log/logd/lgs_config.cc
+++ b/src/log/logd/lgs_config.cc
@@ -975,6 +975,7 @@ static void read_logsv_config_obj_2() {
   SaImmAccessorHandleT accessorHandle;
   SaImmAttrValuesT_2 *attribute;
   SaImmAttrValuesT_2 **attributes;
+  // [Lennart] Not needed
   SaVersionT imm_version = KImmVersion;
   int i = 0;
   int n;
@@ -982,6 +983,8 @@ static void read_logsv_config_obj_2() {
   TRACE_ENTER();
 
   /* NOTE: immutil init will osaf_assert if error */
+  // [Lennart] immutil_saImmOmInitialize() takes a const IMM version. Has
+  // internal copying. Use the constant as in-parameter
   SaAisErrorT om_rc =
       immutil_saImmOmInitialize(&omHandle, nullptr, &imm_version);
   if (om_rc != SA_AIS_OK) {
diff --git a/src/log/logd/lgs_imm.cc b/src/log/logd/lgs_imm.cc
index 49dd49bce..8ca7e8c51 100644
--- a/src/log/logd/lgs_imm.cc
+++ b/src/log/logd/lgs_imm.cc
@@ -975,6 +975,8 @@ static lgs_stream_defval_t *get_SaLogStreamConfig_default() {
      * We are only interested in saLogStreamMaxLogFileSize and
      * saLogStreamFixedLogRecordSize
      */
+    // [Lennart] Not needed. Use constant as in-parameter. See comment in
+    // lgs_config.cc
     SaVersionT imm_version = KImmVersion;
     rc = immutil_saImmOmInitialize(&om_handle, NULL, &imm_version);
     if (rc != SA_AIS_OK) {
@@ -2883,6 +2885,8 @@ SaAisErrorT lgs_imm_init_configStreams(lgs_cb_t *cb) {
   int int_rc = 0;
   log_stream_t *stream;
   SaImmHandleT omHandle;
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
   SaImmSearchHandleT immSearchHandle;
   SaImmSearchParametersT_2 objectSearch;
@@ -3042,6 +3046,7 @@ void lgs_imm_init_OI_handle(SaImmOiHandleT *immOiHandle,
   TRACE_ENTER();
 
   /* Initialize IMM OI service */
+  // [Lennart] Better to set imm_verion here
   rc = saImmOiInitialize_2(immOiHandle, &callbacks, &imm_version);
   while ((rc == SA_AIS_ERR_TRY_AGAIN) &&
          (msecs_waited < max_waiting_time_60s)) {
@@ -3290,6 +3295,8 @@ void lgs_search_stream_objects() {
   SaImmHandleT immOmHandle;
   SaImmSearchHandleT immSearchHandle;
   const char *class_name = "SaLogStream";
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
 
   TRACE_ENTER();
@@ -3459,6 +3466,8 @@ int lgs_get_streamobj_attr(SaImmAttrValuesT_2 ***attrib_out,
                            SaImmHandleT *immOmHandle) {
   int rc = 0;
   SaAisErrorT ais_rc = SA_AIS_OK;
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
   SaImmAccessorHandleT accessorHandle;
   char *attribute_names[] = {
@@ -3562,6 +3571,8 @@ int lgs_free_streamobj_attr(SaImmHandleT immOmHandle) {
 SaUint32T *lgs_get_scAbsenceAllowed_attr(SaUint32T *attr_val) {
   SaUint32T *rc_attr_val = NULL;
   SaAisErrorT ais_rc = SA_AIS_OK;
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
   SaImmAccessorHandleT accessorHandle;
   SaImmHandleT immOmHandle;
diff --git a/src/log/logd/lgs_imm_gcfg.cc b/src/log/logd/lgs_imm_gcfg.cc
index 38131f28a..b8e25acba 100644
--- a/src/log/logd/lgs_imm_gcfg.cc
+++ b/src/log/logd/lgs_imm_gcfg.cc
@@ -572,6 +572,8 @@ static int read_network_name() {
   SaImmAttrValuesT_2 **attributes;
   SaImmAttrValuesT_2 *attribute;
   void *value = NULL;
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
 
   /* Setup search initialize parameters */
@@ -687,6 +689,8 @@ static int applier_init(SaImmOiHandleT *imm_appl_hdl,
                         SaSelectionObjectT *imm_appl_selobj) {
   SaAisErrorT ais_rc = SA_AIS_OK;
   int rc = 0;
+  // [Lennart] Not needed. Use constant as in-parameter. See comment in
+  // lgs_config.cc
   SaVersionT imm_version = KImmVersion;
 
   TRACE_ENTER();