diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c
index 697b6950a..4d55d8fb7 100644
--- a/rigs/icom/xiegu.c
+++ b/rigs/icom/xiegu.c
@@ -504,7 +504,7 @@ const struct rig_caps g90_caps =
     RIG_MODEL(RIG_MODEL_G90),
     .model_name = "G90",
     .mfg_name =  "Xiegu",
-    .version =  BACKEND_VER ".4",
+    .version =  BACKEND_VER ".5",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -541,6 +541,7 @@ const struct rig_caps g90_caps =
     .max_ifshift =  Hz(0), /* TODO */
     .targetable_vfo =  0,
     .vfo_ops =  X108G_VFO_OPS,
+    .targetable_vfo =  RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
     .scan_ops =  X108G_SCAN_OPS,
     .transceive =  RIG_TRN_RIG,
     .bank_qty =   5,
@@ -632,8 +633,8 @@ const struct rig_caps g90_caps =
 
     .set_freq =  icom_set_freq,
     .get_freq =  icom_get_freq,
-    .set_mode =  icom_set_mode_with_data,
-    .get_mode =  icom_get_mode_with_data,
+    .set_mode =  icom_set_mode,
+    .get_mode =  icom_get_mode,
     .set_vfo =  icom_set_vfo,
     .set_ant =  NULL,  /*automatically set by rig depending band */
     .get_ant =  NULL,
@@ -664,12 +665,12 @@ const struct rig_caps g90_caps =
     .get_ctcss_sql =  icom_get_ctcss_sql,
     .set_dcs_code =  icom_set_dcs_code,
     .get_dcs_code =  icom_get_dcs_code,
-    //.set_split_freq =  x108g_set_split_freq,
-    //.get_split_freq =  icom_get_split_freq,
-    //.set_split_mode =  x108g_set_split_mode,
-    //.get_split_mode =  icom_get_split_mode,
-    //.set_split_vfo =  x108g_set_split_vfo,
-    //.get_split_vfo =  NULL,
+    .set_split_freq =  icom_set_split_freq,
+    .get_split_freq =  icom_get_split_freq,
+    .set_split_mode =  icom_set_split_mode,
+    .get_split_mode =  icom_get_split_mode,
+    .set_split_vfo =  icom_set_split_vfo,
+    .get_split_vfo =  NULL,
     //.set_powerstat = icom_set_powerstat,
     //.get_powerstat = icom_get_powerstat,
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/simulators/simxiegug90.c b/simulators/simxiegug90.c
index 1e4d58bc6..9d8a807f4 100644
--- a/simulators/simxiegug90.c
+++ b/simulators/simxiegug90.c
@@ -21,7 +21,7 @@ struct ip_mreq
 #include "../src/misc.h"
 
 #define BUFSIZE 256
-//#define X25
+#define X25
 
 int civ_731_mode = 0;
 vfo_t current_vfo = RIG_VFO_A;