diff --git a/bochs/cpu/cpuid.cc b/bochs/cpu/cpuid.cc
index 50dd5f03f..5b7e5d39b 100644
--- a/bochs/cpu/cpuid.cc
+++ b/bochs/cpu/cpuid.cc
@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//   Copyright (c) 2014-2020 Stanislav Shwartsman
+//   Copyright (c) 2014-2023 Stanislav Shwartsman
 //          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
 //
 //  This library is free software; you can redistribute it and/or
@@ -701,7 +701,7 @@ Bit32u bx_cpuid_t::get_ext_cpuid_leaf_1_ecx_intel(Bit32u extra) const
   //   [31:29] Reserved
 
 #if BX_SUPPORT_X86_64
-  if (is_cpu_extension_supported(BX_ISA_LONG_MODE))
+  if (is_cpu_extension_supported(BX_ISA_LM_LAHF_SAHF))
     ecx |= BX_CPUID_EXT1_ECX_LAHF_SAHF;
 #endif
 
@@ -1278,5 +1278,5 @@ void bx_cpuid_t::dump_features() const
   BX_INFO(("CPU Features supported:"));
   for (unsigned i=1; i<BX_ISA_EXTENSION_LAST; i++)
     if (is_cpu_extension_supported(i))
-      BX_INFO(("\t\t%s", cpu_feature_name[i]));
+      BX_INFO(("\t\t%s", get_cpu_feature_name(i)));
 }
diff --git a/bochs/cpu/decoder/features.h b/bochs/cpu/decoder/features.h
index b6dec1fb3..a0108474b 100644
--- a/bochs/cpu/decoder/features.h
+++ b/bochs/cpu/decoder/features.h
@@ -19,9 +19,6 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
 /////////////////////////////////////////////////////////////////////////
 
-#ifndef BX_X86_FEATURES_H
-#define BX_X86_FEATURES_H
-
 x86_feature(BX_ISA_386, "386ni")                                        /* 386 or earlier instruction */
 x86_feature(BX_ISA_X87, "x87")                                          /* FPU (x87) instruction */
 x86_feature(BX_ISA_486, "486ni")                                        /* 486 new instruction */
@@ -137,5 +134,3 @@ x86_feature(BX_ISA_WRMSRNS, "wrmsrns")                                  /* Non-S
 x86_feature(BX_ISA_CMPCCXADD, "cmpccxadd")                              /* CMPccXADD instructions */
 x86_feature(BX_ISA_SERIALIZE, "serialize")                              /* SERIALIZE instruction */
 x86_feature(BX_ISA_LASS, "lass")                                        /* Linear Address Space Separation support */
-
-#endif