diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index 7196efa58..518b410f3 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -26955,7 +26955,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2019-08-01T08:47:20.086+02:00
+              Generated 2019-08-04T02:40:24.306+02:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/webapi/webapiadapterbase.cpp b/sdrbase/webapi/webapiadapterbase.cpp
index f84f9b49d..f718128e4 100644
--- a/sdrbase/webapi/webapiadapterbase.cpp
+++ b/sdrbase/webapi/webapiadapterbase.cpp
@@ -96,6 +96,11 @@ void WebAPIAdapterBase::webapiFormatPreset(
         swgdeviceConfigs->back()->setDeviceSequence(deviceConfig.m_deviceSequence);
         const QByteArray& deviceSettings = deviceConfig.m_config;
         SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = swgdeviceConfigs->back()->getConfig();
+        // qDebug("WebAPIAdapterBase::webapiFormatPreset: preset: %s:%s(%lld) device: %s",
+        //     qPrintable(preset.getGroup()),
+        //     qPrintable(preset.getDescription()),
+        //     preset.getCenterFrequency(),
+        //     qPrintable(deviceConfig.m_deviceId));
         swgDeviceSettings->init();
         DeviceWebAPIAdapter *deviceWebAPIAdapter = m_webAPIDeviceAdapters.getDeviceWebAPIAdapter(deviceConfig.m_deviceId, m_pluginManager);
 
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index 7196efa58..518b410f3 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -26955,7 +26955,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2019-08-01T08:47:20.086+02:00
+              Generated 2019-08-04T02:40:24.306+02:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMBEDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGAMBEDevice.cpp
index da70e4d25..e31a7839b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMBEDevice.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMBEDevice.cpp
@@ -120,8 +120,12 @@ bool
 SWGAMBEDevice::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_ref != nullptr && *device_ref != QString("")){ isObjectUpdated = true; break;}
-        if(m__delete_isSet){ isObjectUpdated = true; break;}
+        if(device_ref && *device_ref != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m__delete_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMBEDevices.cpp b/swagger/sdrangel/code/qt5/client/SWGAMBEDevices.cpp
index 63d452e20..f4ce6870f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMBEDevices.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMBEDevices.cpp
@@ -92,7 +92,7 @@ SWGAMBEDevices::asJsonObject() {
     if(m_nb_devices_isSet){
         obj->insert("nbDevices", QJsonValue(nb_devices));
     }
-    if(ambe_devices->size() > 0){
+    if(ambe_devices && ambe_devices->size() > 0){
         toJsonArray((QList<void*>*)ambe_devices, obj, "ambeDevices", "SWGAMBEDevice");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGAMBEDevices::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_nb_devices_isSet){ isObjectUpdated = true; break;}
-        if(ambe_devices->size() > 0){ isObjectUpdated = true; break;}
+        if(m_nb_devices_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(ambe_devices && (ambe_devices->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGAMDemodReport.cpp
index 1f39630d7..5b058f44f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGAMDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
index 63ecf5170..8c41e995c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp
@@ -424,23 +424,57 @@ bool
 SWGAMDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_bandpass_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_pll_isSet){ isObjectUpdated = true; break;}
-        if(m_sync_am_operation_isSet){ isObjectUpdated = true; break;}
-        if(m_stream_index_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandpass_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_pll_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sync_am_operation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGAMModReport.cpp
index 19ebbe84c..b9bcfea41 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMModReport.cpp
@@ -138,9 +138,15 @@ bool
 SWGAMModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
index e4eea95dd..f6add9269 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp
@@ -426,23 +426,57 @@ bool
 SWGAMModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_mod_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_tone_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_mod_af_input_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(cw_keyer != nullptr && cw_keyer->isSet()){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tone_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_af_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(cw_keyer && cw_keyer->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGATVModReport.cpp
index 37944a83f..bffd80419 100644
--- a/swagger/sdrangel/code/qt5/client/SWGATVModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGATVModReport.cpp
@@ -118,8 +118,12 @@ bool
 SWGATVModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
index ba0d8be81..a24951cf8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp
@@ -648,34 +648,90 @@ bool
 SWGATVModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_opp_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_atv_std_isSet){ isObjectUpdated = true; break;}
-        if(m_nb_lines_isSet){ isObjectUpdated = true; break;}
-        if(m_fps_isSet){ isObjectUpdated = true; break;}
-        if(m_atv_mod_input_isSet){ isObjectUpdated = true; break;}
-        if(m_uniform_level_isSet){ isObjectUpdated = true; break;}
-        if(m_atv_modulation_isSet){ isObjectUpdated = true; break;}
-        if(m_video_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_video_play_isSet){ isObjectUpdated = true; break;}
-        if(m_camera_play_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_inverted_video_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_scaling_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_excursion_isSet){ isObjectUpdated = true; break;}
-        if(m_force_decimator_isSet){ isObjectUpdated = true; break;}
-        if(m_show_overlay_text_isSet){ isObjectUpdated = true; break;}
-        if(overlay_text != nullptr && *overlay_text != QString("")){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(image_file_name != nullptr && *image_file_name != QString("")){ isObjectUpdated = true; break;}
-        if(video_file_name != nullptr && *video_file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_opp_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_atv_std_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_lines_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fps_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_atv_mod_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_uniform_level_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_atv_modulation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_video_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_video_play_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_camera_play_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_inverted_video_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_scaling_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_excursion_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_force_decimator_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_show_overlay_text_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(overlay_text && *overlay_text != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(image_file_name && *image_file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(video_file_name && *video_file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFReport.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspyHFReport.cpp
index 151237845..ceae52087 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFReport.cpp
@@ -82,7 +82,7 @@ SWGAirspyHFReport::asJson ()
 QJsonObject*
 SWGAirspyHFReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(sample_rates->size() > 0){
+    if(sample_rates && sample_rates->size() > 0){
         toJsonArray((QList<void*>*)sample_rates, obj, "sampleRates", "SWGSampleRate");
     }
 
@@ -104,7 +104,9 @@ bool
 SWGAirspyHFReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(sample_rates->size() > 0){ isObjectUpdated = true; break;}
+        if(sample_rates && (sample_rates->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp
index fa735cac7..de4d2b52d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp
@@ -462,25 +462,63 @@ bool
 SWGAirspyHFSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_index_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_band_index_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_use_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_high_isSet){ isObjectUpdated = true; break;}
-        if(m_use_dsp_isSet){ isObjectUpdated = true; break;}
-        if(m_use_lna_isSet){ isObjectUpdated = true; break;}
-        if(m_attenuator_steps_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_band_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_high_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_dsp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_lna_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_attenuator_steps_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyReport.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspyReport.cpp
index 2e04d08fb..3db7cb20d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAirspyReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAirspyReport.cpp
@@ -82,7 +82,7 @@ SWGAirspyReport::asJson ()
 QJsonObject*
 SWGAirspyReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(sample_rates->size() > 0){
+    if(sample_rates && sample_rates->size() > 0){
         toJsonArray((QList<void*>*)sample_rates, obj, "sampleRates", "SWGSampleRate");
     }
 
@@ -104,7 +104,9 @@ bool
 SWGAirspyReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(sample_rates->size() > 0){ isObjectUpdated = true; break;}
+        if(sample_rates && (sample_rates->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp
index 3f7b18f5e..fdb020233 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp
@@ -482,26 +482,66 @@ bool
 SWGAirspySettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_index_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_mixer_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_vga_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_mixer_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_t_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mixer_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mixer_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_t_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGArgInfo.cpp b/swagger/sdrangel/code/qt5/client/SWGArgInfo.cpp
index bd3bbda41..cebf22f69 100644
--- a/swagger/sdrangel/code/qt5/client/SWGArgInfo.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGArgInfo.cpp
@@ -179,10 +179,10 @@ SWGArgInfo::asJsonObject() {
     if((range != nullptr) && (range->isSet())){
         toJsonValue(QString("range"), range, obj, QString("SWGRangeFloat"));
     }
-    if(value_options->size() > 0){
+    if(value_options && value_options->size() > 0){
         toJsonArray((QList<void*>*)value_options, obj, "valueOptions", "QString");
     }
-    if(option_names->size() > 0){
+    if(option_names && option_names->size() > 0){
         toJsonArray((QList<void*>*)option_names, obj, "optionNames", "QString");
     }
 
@@ -284,15 +284,33 @@ bool
 SWGArgInfo::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(key != nullptr && *key != QString("")){ isObjectUpdated = true; break;}
-        if(value_type != nullptr && *value_type != QString("")){ isObjectUpdated = true; break;}
-        if(value_string != nullptr && *value_string != QString("")){ isObjectUpdated = true; break;}
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(description != nullptr && *description != QString("")){ isObjectUpdated = true; break;}
-        if(units != nullptr && *units != QString("")){ isObjectUpdated = true; break;}
-        if(range != nullptr && range->isSet()){ isObjectUpdated = true; break;}
-        if(value_options->size() > 0){ isObjectUpdated = true; break;}
-        if(option_names->size() > 0){ isObjectUpdated = true; break;}
+        if(key && *key != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(value_type && *value_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(value_string && *value_string != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(description && *description != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(units && *units != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(range && range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(value_options && (value_options->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(option_names && (option_names->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGArgValue.cpp b/swagger/sdrangel/code/qt5/client/SWGArgValue.cpp
index 3c0423667..d4aa41f69 100644
--- a/swagger/sdrangel/code/qt5/client/SWGArgValue.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGArgValue.cpp
@@ -144,9 +144,15 @@ bool
 SWGArgValue::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(key != nullptr && *key != QString("")){ isObjectUpdated = true; break;}
-        if(value_type != nullptr && *value_type != QString("")){ isObjectUpdated = true; break;}
-        if(value_string != nullptr && *value_string != QString("")){ isObjectUpdated = true; break;}
+        if(key && *key != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(value_type && *value_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(value_string && *value_string != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
index 1849edc43..6c2228050 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioDevices.cpp
@@ -112,13 +112,13 @@ SWGAudioDevices::asJsonObject() {
     if(m_nb_input_devices_isSet){
         obj->insert("nbInputDevices", QJsonValue(nb_input_devices));
     }
-    if(input_devices->size() > 0){
+    if(input_devices && input_devices->size() > 0){
         toJsonArray((QList<void*>*)input_devices, obj, "inputDevices", "SWGAudioInputDevice");
     }
     if(m_nb_output_devices_isSet){
         obj->insert("nbOutputDevices", QJsonValue(nb_output_devices));
     }
-    if(output_devices->size() > 0){
+    if(output_devices && output_devices->size() > 0){
         toJsonArray((QList<void*>*)output_devices, obj, "outputDevices", "SWGAudioOutputDevice");
     }
 
@@ -170,10 +170,18 @@ bool
 SWGAudioDevices::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_nb_input_devices_isSet){ isObjectUpdated = true; break;}
-        if(input_devices->size() > 0){ isObjectUpdated = true; break;}
-        if(m_nb_output_devices_isSet){ isObjectUpdated = true; break;}
-        if(output_devices->size() > 0){ isObjectUpdated = true; break;}
+        if(m_nb_input_devices_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(input_devices && (input_devices->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_output_devices_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(output_devices && (output_devices->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioInputDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioInputDevice.cpp
index 68df68d7b..15c6caf89 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioInputDevice.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioInputDevice.cpp
@@ -200,12 +200,24 @@ bool
 SWGAudioInputDevice::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(m_index_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_is_system_default_isSet){ isObjectUpdated = true; break;}
-        if(m_default_unregistered_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_is_system_default_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_default_unregistered_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGAudioOutputDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGAudioOutputDevice.cpp
index a8c56fe2d..c350b4088 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAudioOutputDevice.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAudioOutputDevice.cpp
@@ -322,18 +322,42 @@ bool
 SWGAudioOutputDevice::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(m_index_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_is_system_default_isSet){ isObjectUpdated = true; break;}
-        if(m_default_unregistered_isSet){ isObjectUpdated = true; break;}
-        if(m_copy_to_udp_isSet){ isObjectUpdated = true; break;}
-        if(m_udp_uses_rtp_isSet){ isObjectUpdated = true; break;}
-        if(m_udp_channel_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_udp_channel_codec_isSet){ isObjectUpdated = true; break;}
-        if(m_udp_decimation_factor_isSet){ isObjectUpdated = true; break;}
-        if(udp_address != nullptr && *udp_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_udp_port_isSet){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_is_system_default_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_default_unregistered_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_copy_to_udp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_uses_rtp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_channel_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_channel_codec_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_decimation_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(udp_address && *udp_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_port_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBFMDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGBFMDemodReport.cpp
index d0b2010a6..8ae631076 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBFMDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBFMDemodReport.cpp
@@ -220,13 +220,27 @@ bool
 SWGBFMDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_pilot_locked_isSet){ isObjectUpdated = true; break;}
-        if(m_pilot_power_db_isSet){ isObjectUpdated = true; break;}
-        if(rds_report != nullptr && rds_report->isSet()){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pilot_locked_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pilot_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(rds_report && rds_report->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp
index 30784ef6a..f64e22661 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp
@@ -424,23 +424,57 @@ bool
 SWGBFMDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_af_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_stereo_isSet){ isObjectUpdated = true; break;}
-        if(m_lsb_stereo_isSet){ isObjectUpdated = true; break;}
-        if(m_show_pilot_isSet){ isObjectUpdated = true; break;}
-        if(m_rds_active_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_af_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_stereo_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lsb_stereo_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_show_pilot_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rds_active_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBandwidth.cpp b/swagger/sdrangel/code/qt5/client/SWGBandwidth.cpp
index 7b56ac8b1..158076e25 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBandwidth.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBandwidth.cpp
@@ -98,7 +98,9 @@ bool
 SWGBandwidth::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp
index 9048631db..13870eb7a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp
@@ -442,24 +442,60 @@ bool
 SWGBladeRF1InputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_vga1_isSet){ isObjectUpdated = true; break;}
-        if(m_vga2_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_path_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_filter_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga1_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_filter_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp
index 32806848c..51ec2b904 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp
@@ -340,19 +340,45 @@ bool
 SWGBladeRF1OutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_vga1_isSet){ isObjectUpdated = true; break;}
-        if(m_vga2_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_path_isSet){ isObjectUpdated = true; break;}
-        if(m_xb200_filter_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga1_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_xb200_filter_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputReport.cpp
index 2222ce3f0..ae6782dce 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputReport.cpp
@@ -130,7 +130,7 @@ SWGBladeRF2InputReport::asJsonObject() {
     if((global_gain_range != nullptr) && (global_gain_range->isSet())){
         toJsonValue(QString("globalGainRange"), global_gain_range, obj, QString("SWGRange"));
     }
-    if(gain_modes->size() > 0){
+    if(gain_modes && gain_modes->size() > 0){
         toJsonArray((QList<void*>*)gain_modes, obj, "gainModes", "SWGNamedEnum");
     }
 
@@ -192,11 +192,21 @@ bool
 SWGBladeRF2InputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(frequency_range != nullptr && frequency_range->isSet()){ isObjectUpdated = true; break;}
-        if(sample_rate_range != nullptr && sample_rate_range->isSet()){ isObjectUpdated = true; break;}
-        if(bandwidth_range != nullptr && bandwidth_range->isSet()){ isObjectUpdated = true; break;}
-        if(global_gain_range != nullptr && global_gain_range->isSet()){ isObjectUpdated = true; break;}
-        if(gain_modes->size() > 0){ isObjectUpdated = true; break;}
+        if(frequency_range && frequency_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(sample_rate_range && sample_rate_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(bandwidth_range && bandwidth_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(global_gain_range && global_gain_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(gain_modes && (gain_modes->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp
index b8d462da7..dc15fa7f8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp
@@ -442,24 +442,60 @@ bool
 SWGBladeRF2InputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_global_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_tee_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_global_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_tee_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputReport.cpp
index 77f95f0de..b811061e7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputReport.cpp
@@ -166,10 +166,18 @@ bool
 SWGBladeRF2OutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(frequency_range != nullptr && frequency_range->isSet()){ isObjectUpdated = true; break;}
-        if(sample_rate_range != nullptr && sample_rate_range->isSet()){ isObjectUpdated = true; break;}
-        if(bandwidth_range != nullptr && bandwidth_range->isSet()){ isObjectUpdated = true; break;}
-        if(global_gain_range != nullptr && global_gain_range->isSet()){ isObjectUpdated = true; break;}
+        if(frequency_range && frequency_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(sample_rate_range && sample_rate_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(bandwidth_range && bandwidth_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(global_gain_range && global_gain_range->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp
index 906bf59b8..6e2667f7a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp
@@ -340,19 +340,45 @@ bool
 SWGBladeRF2OutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_global_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_tee_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_global_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_tee_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.cpp
index e736c3a1b..ca99d450e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.cpp
@@ -280,16 +280,36 @@ bool
 SWGCWKeyerSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_wpm_isSet){ isObjectUpdated = true; break;}
-        if(m_mode_isSet){ isObjectUpdated = true; break;}
-        if(text != nullptr && *text != QString("")){ isObjectUpdated = true; break;}
-        if(m_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_keyboard_iambic_isSet){ isObjectUpdated = true; break;}
-        if(m_dot_key_isSet){ isObjectUpdated = true; break;}
-        if(m_dot_key_modifiers_isSet){ isObjectUpdated = true; break;}
-        if(m_dash_key_isSet){ isObjectUpdated = true; break;}
-        if(m_dash_key_modifiers_isSet){ isObjectUpdated = true; break;}
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_wpm_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(text && *text != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_keyboard_iambic_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dot_key_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dot_key_modifiers_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dash_key_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dash_key_modifiers_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannel.cpp b/swagger/sdrangel/code/qt5/client/SWGChannel.cpp
index c41e89a94..0f8048e9f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannel.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannel.cpp
@@ -204,12 +204,24 @@ bool
 SWGChannel::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_index_isSet){ isObjectUpdated = true; break;}
-        if(id != nullptr && *id != QString("")){ isObjectUpdated = true; break;}
-        if(m_uid_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(report != nullptr && report->isSet()){ isObjectUpdated = true; break;}
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(id && *id != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_uid_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(report && report->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp
index 790a0e5e2..010a61acf 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp
@@ -122,8 +122,12 @@ bool
 SWGChannelConfig::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(channel_id_uri != nullptr && *channel_id_uri != QString("")){ isObjectUpdated = true; break;}
-        if(config != nullptr && config->isSet()){ isObjectUpdated = true; break;}
+        if(channel_id_uri && *channel_id_uri != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(config && config->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelListItem.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelListItem.cpp
index 4c3403a0c..60a968ef1 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelListItem.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelListItem.cpp
@@ -206,12 +206,24 @@ bool
 SWGChannelListItem::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(id_uri != nullptr && *id_uri != QString("")){ isObjectUpdated = true; break;}
-        if(id != nullptr && *id != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(version != nullptr && *version != QString("")){ isObjectUpdated = true; break;}
-        if(m_index_isSet){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(id_uri && *id_uri != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(id && *id != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(version && *version != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
index e27bf591f..e6d7524e2 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
@@ -516,26 +516,66 @@ bool
 SWGChannelReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(channel_type != nullptr && *channel_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(am_demod_report != nullptr && am_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(am_mod_report != nullptr && am_mod_report->isSet()){ isObjectUpdated = true; break;}
-        if(atv_mod_report != nullptr && atv_mod_report->isSet()){ isObjectUpdated = true; break;}
-        if(bfm_demod_report != nullptr && bfm_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(dsd_demod_report != nullptr && dsd_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(file_source_report != nullptr && file_source_report->isSet()){ isObjectUpdated = true; break;}
-        if(free_dv_demod_report != nullptr && free_dv_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(free_dv_mod_report != nullptr && free_dv_mod_report->isSet()){ isObjectUpdated = true; break;}
-        if(freq_tracker_report != nullptr && freq_tracker_report->isSet()){ isObjectUpdated = true; break;}
-        if(nfm_demod_report != nullptr && nfm_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(nfm_mod_report != nullptr && nfm_mod_report->isSet()){ isObjectUpdated = true; break;}
-        if(ssb_demod_report != nullptr && ssb_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(remote_source_report != nullptr && remote_source_report->isSet()){ isObjectUpdated = true; break;}
-        if(ssb_mod_report != nullptr && ssb_mod_report->isSet()){ isObjectUpdated = true; break;}
-        if(udp_source_report != nullptr && udp_source_report->isSet()){ isObjectUpdated = true; break;}
-        if(udp_sink_report != nullptr && udp_sink_report->isSet()){ isObjectUpdated = true; break;}
-        if(wfm_demod_report != nullptr && wfm_demod_report->isSet()){ isObjectUpdated = true; break;}
-        if(wfm_mod_report != nullptr && wfm_mod_report->isSet()){ isObjectUpdated = true; break;}
+        if(channel_type && *channel_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(am_demod_report && am_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(am_mod_report && am_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(atv_mod_report && atv_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(bfm_demod_report && bfm_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(dsd_demod_report && dsd_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(file_source_report && file_source_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(free_dv_demod_report && free_dv_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(free_dv_mod_report && free_dv_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(freq_tracker_report && freq_tracker_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(nfm_demod_report && nfm_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(nfm_mod_report && nfm_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(ssb_demod_report && ssb_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_source_report && remote_source_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(ssb_mod_report && ssb_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(udp_source_report && udp_source_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(udp_sink_report && udp_sink_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(wfm_demod_report && wfm_demod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(wfm_mod_report && wfm_mod_report->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
index 72c292468..a8cc77e3d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
@@ -622,31 +622,81 @@ bool
 SWGChannelSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(channel_type != nullptr && *channel_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(m_originator_device_set_index_isSet){ isObjectUpdated = true; break;}
-        if(m_originator_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(am_demod_settings != nullptr && am_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(am_mod_settings != nullptr && am_mod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(atv_mod_settings != nullptr && atv_mod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(bfm_demod_settings != nullptr && bfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(dsd_demod_settings != nullptr && dsd_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(file_source_settings != nullptr && file_source_settings->isSet()){ isObjectUpdated = true; break;}
-        if(free_dv_demod_settings != nullptr && free_dv_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(free_dv_mod_settings != nullptr && free_dv_mod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(freq_tracker_settings != nullptr && freq_tracker_settings->isSet()){ isObjectUpdated = true; break;}
-        if(nfm_demod_settings != nullptr && nfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(nfm_mod_settings != nullptr && nfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(local_sink_settings != nullptr && local_sink_settings->isSet()){ isObjectUpdated = true; break;}
-        if(local_source_settings != nullptr && local_source_settings->isSet()){ isObjectUpdated = true; break;}
-        if(remote_sink_settings != nullptr && remote_sink_settings->isSet()){ isObjectUpdated = true; break;}
-        if(remote_source_settings != nullptr && remote_source_settings->isSet()){ isObjectUpdated = true; break;}
-        if(ssb_mod_settings != nullptr && ssb_mod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(ssb_demod_settings != nullptr && ssb_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(udp_source_settings != nullptr && udp_source_settings->isSet()){ isObjectUpdated = true; break;}
-        if(udp_sink_settings != nullptr && udp_sink_settings->isSet()){ isObjectUpdated = true; break;}
-        if(wfm_demod_settings != nullptr && wfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
-        if(wfm_mod_settings != nullptr && wfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
+        if(channel_type && *channel_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_originator_device_set_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_originator_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(am_demod_settings && am_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(am_mod_settings && am_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(atv_mod_settings && atv_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(bfm_demod_settings && bfm_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(dsd_demod_settings && dsd_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(file_source_settings && file_source_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(free_dv_demod_settings && free_dv_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(free_dv_mod_settings && free_dv_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(freq_tracker_settings && freq_tracker_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(nfm_demod_settings && nfm_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(nfm_mod_settings && nfm_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_sink_settings && local_sink_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_source_settings && local_source_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_sink_settings && remote_sink_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_source_settings && remote_source_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(ssb_mod_settings && ssb_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(ssb_demod_settings && ssb_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(udp_source_settings && udp_source_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(udp_sink_settings && udp_sink_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(wfm_demod_settings && wfm_demod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(wfm_mod_settings && wfm_mod_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelsDetail.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelsDetail.cpp
index 3ab627d67..d18104b90 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelsDetail.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelsDetail.cpp
@@ -92,7 +92,7 @@ SWGChannelsDetail::asJsonObject() {
     if(m_channelcount_isSet){
         obj->insert("channelcount", QJsonValue(channelcount));
     }
-    if(channels->size() > 0){
+    if(channels && channels->size() > 0){
         toJsonArray((QList<void*>*)channels, obj, "channels", "SWGChannel");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGChannelsDetail::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channelcount_isSet){ isObjectUpdated = true; break;}
-        if(channels->size() > 0){ isObjectUpdated = true; break;}
+        if(m_channelcount_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(channels && (channels->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGCommand.cpp b/swagger/sdrangel/code/qt5/client/SWGCommand.cpp
index c63832dfc..4801a5815 100644
--- a/swagger/sdrangel/code/qt5/client/SWGCommand.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGCommand.cpp
@@ -246,14 +246,30 @@ bool
 SWGCommand::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(group != nullptr && *group != QString("")){ isObjectUpdated = true; break;}
-        if(description != nullptr && *description != QString("")){ isObjectUpdated = true; break;}
-        if(command != nullptr && *command != QString("")){ isObjectUpdated = true; break;}
-        if(arg_string != nullptr && *arg_string != QString("")){ isObjectUpdated = true; break;}
-        if(m_key_isSet){ isObjectUpdated = true; break;}
-        if(m_key_modifiers_isSet){ isObjectUpdated = true; break;}
-        if(m_associate_key_isSet){ isObjectUpdated = true; break;}
-        if(m_release_isSet){ isObjectUpdated = true; break;}
+        if(group && *group != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(description && *description != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(command && *command != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(arg_string && *arg_string != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_key_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_key_modifiers_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_associate_key_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_release_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGComplex.cpp b/swagger/sdrangel/code/qt5/client/SWGComplex.cpp
index 0fd3df96e..329097ab9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGComplex.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGComplex.cpp
@@ -118,8 +118,12 @@ bool
 SWGComplex::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_real_isSet){ isObjectUpdated = true; break;}
-        if(m_imag_isSet){ isObjectUpdated = true; break;}
+        if(m_real_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_imag_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGDSDDemodReport.cpp
index cabcd2741..632caa688 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodReport.cpp
@@ -342,19 +342,45 @@ bool
 SWGDSDDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_pll_locked_isSet){ isObjectUpdated = true; break;}
-        if(m_slot1_on_isSet){ isObjectUpdated = true; break;}
-        if(m_slot2_on_isSet){ isObjectUpdated = true; break;}
-        if(sync_type != nullptr && *sync_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_in_level_isSet){ isObjectUpdated = true; break;}
-        if(m_carier_position_isSet){ isObjectUpdated = true; break;}
-        if(m_zero_crossing_position_isSet){ isObjectUpdated = true; break;}
-        if(m_sync_rate_isSet){ isObjectUpdated = true; break;}
-        if(status_text != nullptr && *status_text != QString("")){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pll_locked_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_slot1_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_slot2_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(sync_type && *sync_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_in_level_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_carier_position_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_zero_crossing_position_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sync_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(status_text && *status_text != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp
index 8b76f277e..55301cee2 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp
@@ -624,33 +624,87 @@ bool
 SWGDSDDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_demod_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_baud_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_enable_cosine_filtering_isSet){ isObjectUpdated = true; break;}
-        if(m_sync_or_constellation_isSet){ isObjectUpdated = true; break;}
-        if(m_slot1_on_isSet){ isObjectUpdated = true; break;}
-        if(m_slot2_on_isSet){ isObjectUpdated = true; break;}
-        if(m_tdma_stereo_isSet){ isObjectUpdated = true; break;}
-        if(m_pll_lock_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_high_pass_filter_isSet){ isObjectUpdated = true; break;}
-        if(m_trace_length_mutliplier_isSet){ isObjectUpdated = true; break;}
-        if(m_trace_stroke_isSet){ isObjectUpdated = true; break;}
-        if(m_trace_decay_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_demod_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_baud_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_enable_cosine_filtering_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sync_or_constellation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_slot1_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_slot2_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tdma_stereo_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pll_lock_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_high_pass_filter_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_trace_length_mutliplier_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_trace_stroke_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_trace_decay_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.cpp
index 451cfcee5..78d4d3817 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.cpp
@@ -100,7 +100,9 @@ bool
 SWGDVSerialDevice::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_name != nullptr && *device_name != QString("")){ isObjectUpdated = true; break;}
+        if(device_name && *device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDVSerialDevices.cpp b/swagger/sdrangel/code/qt5/client/SWGDVSerialDevices.cpp
index 3728a43e1..e58e29f9c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDVSerialDevices.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDVSerialDevices.cpp
@@ -92,7 +92,7 @@ SWGDVSerialDevices::asJsonObject() {
     if(m_nb_devices_isSet){
         obj->insert("nbDevices", QJsonValue(nb_devices));
     }
-    if(dv_serial_devices->size() > 0){
+    if(dv_serial_devices && dv_serial_devices->size() > 0){
         toJsonArray((QList<void*>*)dv_serial_devices, obj, "dvSerialDevices", "SWGDVSerialDevice");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGDVSerialDevices::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_nb_devices_isSet){ isObjectUpdated = true; break;}
-        if(dv_serial_devices->size() > 0){ isObjectUpdated = true; break;}
+        if(m_nb_devices_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(dv_serial_devices && (dv_serial_devices->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp
index dfe92b496..d771ee614 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp
@@ -164,10 +164,18 @@ bool
 SWGDeviceConfig::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_id != nullptr && *device_id != QString("")){ isObjectUpdated = true; break;}
-        if(device_serial != nullptr && *device_serial != QString("")){ isObjectUpdated = true; break;}
-        if(m_device_sequence_isSet){ isObjectUpdated = true; break;}
-        if(config != nullptr && config->isSet()){ isObjectUpdated = true; break;}
+        if(device_id && *device_id != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(device_serial && *device_serial != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_sequence_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(config && config->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
index 8c5779fb8..b1b2d8b29 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
@@ -264,15 +264,33 @@ bool
 SWGDeviceListItem::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(displayed_name != nullptr && *displayed_name != QString("")){ isObjectUpdated = true; break;}
-        if(hw_type != nullptr && *hw_type != QString("")){ isObjectUpdated = true; break;}
-        if(serial != nullptr && *serial != QString("")){ isObjectUpdated = true; break;}
-        if(m_sequence_isSet){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(m_device_nb_streams_isSet){ isObjectUpdated = true; break;}
-        if(m_device_stream_index_isSet){ isObjectUpdated = true; break;}
-        if(m_device_set_index_isSet){ isObjectUpdated = true; break;}
-        if(m_index_isSet){ isObjectUpdated = true; break;}
+        if(displayed_name && *displayed_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(hw_type && *hw_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(serial && *serial != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_sequence_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_nb_streams_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_set_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp
index a787ce076..f8b413aef 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp
@@ -582,29 +582,75 @@ bool
 SWGDeviceReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_hw_type != nullptr && *device_hw_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(airspy_report != nullptr && airspy_report->isSet()){ isObjectUpdated = true; break;}
-        if(airspy_hf_report != nullptr && airspy_hf_report->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf2_input_report != nullptr && blade_rf2_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf2_output_report != nullptr && blade_rf2_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(file_input_report != nullptr && file_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(lime_sdr_input_report != nullptr && lime_sdr_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(kiwi_sdr_report != nullptr && kiwi_sdr_report->isSet()){ isObjectUpdated = true; break;}
-        if(lime_sdr_output_report != nullptr && lime_sdr_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(local_input_report != nullptr && local_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(local_output_report != nullptr && local_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(perseus_report != nullptr && perseus_report->isSet()){ isObjectUpdated = true; break;}
-        if(pluto_sdr_input_report != nullptr && pluto_sdr_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(pluto_sdr_output_report != nullptr && pluto_sdr_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(rtl_sdr_report != nullptr && rtl_sdr_report->isSet()){ isObjectUpdated = true; break;}
-        if(remote_output_report != nullptr && remote_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(remote_input_report != nullptr && remote_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(sdr_play_report != nullptr && sdr_play_report->isSet()){ isObjectUpdated = true; break;}
-        if(soapy_sdr_input_report != nullptr && soapy_sdr_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(soapy_sdr_output_report != nullptr && soapy_sdr_output_report->isSet()){ isObjectUpdated = true; break;}
-        if(xtrx_input_report != nullptr && xtrx_input_report->isSet()){ isObjectUpdated = true; break;}
-        if(xtrx_output_report != nullptr && xtrx_output_report->isSet()){ isObjectUpdated = true; break;}
+        if(device_hw_type && *device_hw_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(airspy_report && airspy_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(airspy_hf_report && airspy_hf_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf2_input_report && blade_rf2_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf2_output_report && blade_rf2_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(file_input_report && file_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(lime_sdr_input_report && lime_sdr_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(kiwi_sdr_report && kiwi_sdr_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(lime_sdr_output_report && lime_sdr_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_input_report && local_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_output_report && local_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(perseus_report && perseus_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(pluto_sdr_input_report && pluto_sdr_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(pluto_sdr_output_report && pluto_sdr_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(rtl_sdr_report && rtl_sdr_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_output_report && remote_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_input_report && remote_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(sdr_play_report && sdr_play_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(soapy_sdr_input_report && soapy_sdr_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(soapy_sdr_output_report && soapy_sdr_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(xtrx_input_report && xtrx_input_report->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(xtrx_output_report && xtrx_output_report->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSet.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSet.cpp
index 1b22b316e..7be17e9da 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceSet.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSet.cpp
@@ -104,7 +104,7 @@ SWGDeviceSet::asJsonObject() {
     if(m_channelcount_isSet){
         obj->insert("channelcount", QJsonValue(channelcount));
     }
-    if(channels->size() > 0){
+    if(channels && channels->size() > 0){
         toJsonArray((QList<void*>*)channels, obj, "channels", "SWGChannel");
     }
 
@@ -146,9 +146,15 @@ bool
 SWGDeviceSet::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(sampling_device != nullptr && sampling_device->isSet()){ isObjectUpdated = true; break;}
-        if(m_channelcount_isSet){ isObjectUpdated = true; break;}
-        if(channels->size() > 0){ isObjectUpdated = true; break;}
+        if(sampling_device && sampling_device->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(m_channelcount_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(channels && (channels->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSetList.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSetList.cpp
index 76e42cc76..3e9dd45d3 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceSetList.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSetList.cpp
@@ -102,7 +102,7 @@ SWGDeviceSetList::asJsonObject() {
     if(m_devicesetfocus_isSet){
         obj->insert("devicesetfocus", QJsonValue(devicesetfocus));
     }
-    if(device_sets->size() > 0){
+    if(device_sets && device_sets->size() > 0){
         toJsonArray((QList<void*>*)device_sets, obj, "deviceSets", "SWGDeviceSet");
     }
 
@@ -144,9 +144,15 @@ bool
 SWGDeviceSetList::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_devicesetcount_isSet){ isObjectUpdated = true; break;}
-        if(m_devicesetfocus_isSet){ isObjectUpdated = true; break;}
-        if(device_sets->size() > 0){ isObjectUpdated = true; break;}
+        if(m_devicesetcount_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_devicesetfocus_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(device_sets && (device_sets->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp
index b8269b92e..49f7d7097 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp
@@ -778,38 +778,102 @@ bool
 SWGDeviceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_hw_type != nullptr && *device_hw_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(m_originator_index_isSet){ isObjectUpdated = true; break;}
-        if(airspy_settings != nullptr && airspy_settings->isSet()){ isObjectUpdated = true; break;}
-        if(airspy_hf_settings != nullptr && airspy_hf_settings->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf1_input_settings != nullptr && blade_rf1_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf2_input_settings != nullptr && blade_rf2_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf1_output_settings != nullptr && blade_rf1_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(blade_rf2_output_settings != nullptr && blade_rf2_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(fcd_pro_settings != nullptr && fcd_pro_settings->isSet()){ isObjectUpdated = true; break;}
-        if(fcd_pro_plus_settings != nullptr && fcd_pro_plus_settings->isSet()){ isObjectUpdated = true; break;}
-        if(file_input_settings != nullptr && file_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(hack_rf_input_settings != nullptr && hack_rf_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(hack_rf_output_settings != nullptr && hack_rf_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(kiwi_sdr_settings != nullptr && kiwi_sdr_settings->isSet()){ isObjectUpdated = true; break;}
-        if(lime_sdr_input_settings != nullptr && lime_sdr_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(lime_sdr_output_settings != nullptr && lime_sdr_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(local_input_settings != nullptr && local_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(local_output_settings != nullptr && local_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(perseus_settings != nullptr && perseus_settings->isSet()){ isObjectUpdated = true; break;}
-        if(pluto_sdr_input_settings != nullptr && pluto_sdr_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(pluto_sdr_output_settings != nullptr && pluto_sdr_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(rtl_sdr_settings != nullptr && rtl_sdr_settings->isSet()){ isObjectUpdated = true; break;}
-        if(remote_output_settings != nullptr && remote_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(remote_input_settings != nullptr && remote_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(sdr_play_settings != nullptr && sdr_play_settings->isSet()){ isObjectUpdated = true; break;}
-        if(soapy_sdr_input_settings != nullptr && soapy_sdr_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(soapy_sdr_output_settings != nullptr && soapy_sdr_output_settings->isSet()){ isObjectUpdated = true; break;}
-        if(test_source_settings != nullptr && test_source_settings->isSet()){ isObjectUpdated = true; break;}
-        if(test_mi_settings != nullptr && test_mi_settings->isSet()){ isObjectUpdated = true; break;}
-        if(xtrx_input_settings != nullptr && xtrx_input_settings->isSet()){ isObjectUpdated = true; break;}
-        if(xtrx_output_settings != nullptr && xtrx_output_settings->isSet()){ isObjectUpdated = true; break;}
+        if(device_hw_type && *device_hw_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_originator_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(airspy_settings && airspy_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(airspy_hf_settings && airspy_hf_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf1_input_settings && blade_rf1_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf2_input_settings && blade_rf2_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf1_output_settings && blade_rf1_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(blade_rf2_output_settings && blade_rf2_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(fcd_pro_settings && fcd_pro_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(fcd_pro_plus_settings && fcd_pro_plus_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(file_input_settings && file_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(hack_rf_input_settings && hack_rf_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(hack_rf_output_settings && hack_rf_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(kiwi_sdr_settings && kiwi_sdr_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(lime_sdr_input_settings && lime_sdr_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(lime_sdr_output_settings && lime_sdr_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_input_settings && local_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(local_output_settings && local_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(perseus_settings && perseus_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(pluto_sdr_input_settings && pluto_sdr_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(pluto_sdr_output_settings && pluto_sdr_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(rtl_sdr_settings && rtl_sdr_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_output_settings && remote_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(remote_input_settings && remote_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(sdr_play_settings && sdr_play_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(soapy_sdr_input_settings && soapy_sdr_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(soapy_sdr_output_settings && soapy_sdr_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(test_source_settings && test_source_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(test_mi_settings && test_mi_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(xtrx_input_settings && xtrx_input_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(xtrx_output_settings && xtrx_output_settings->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceState.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceState.cpp
index 8a812f848..bc3bad1da 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceState.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceState.cpp
@@ -100,7 +100,9 @@ bool
 SWGDeviceState::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(state != nullptr && *state != QString("")){ isObjectUpdated = true; break;}
+        if(state && *state != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGErrorResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGErrorResponse.cpp
index d201299c6..6e3128c5d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGErrorResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGErrorResponse.cpp
@@ -100,7 +100,9 @@ bool
 SWGErrorResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(message != nullptr && *message != QString("")){ isObjectUpdated = true; break;}
+        if(message && *message != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp
index fcb4edff7..96fb1392a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp
@@ -482,26 +482,66 @@ bool
 SWGFCDProPlusSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_range_low_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_mix_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_t_isSet){ isObjectUpdated = true; break;}
-        if(m_if_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_if_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_imbalance_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_range_low_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mix_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_t_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_if_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_if_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_imbalance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp
index cb725f23f..6f04b900f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp
@@ -662,35 +662,93 @@ bool
 SWGFCDProSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_enhance_index_isSet){ isObjectUpdated = true; break;}
-        if(m_band_index_isSet){ isObjectUpdated = true; break;}
-        if(m_mixer_gain_index_isSet){ isObjectUpdated = true; break;}
-        if(m_mixer_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_current_index_isSet){ isObjectUpdated = true; break;}
-        if(m_mode_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain1_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rc_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain2_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain3_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain4_index_isSet){ isObjectUpdated = true; break;}
-        if(m_if_filter_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain5_index_isSet){ isObjectUpdated = true; break;}
-        if(m_gain6_index_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_enhance_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_band_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mixer_gain_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mixer_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_current_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mode_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain1_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rc_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain2_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain3_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain4_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_if_filter_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain5_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain6_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFileInputReport.cpp
index d353a2890..94ceaf946 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFileInputReport.cpp
@@ -206,12 +206,24 @@ bool
 SWGFileInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_size_isSet){ isObjectUpdated = true; break;}
-        if(absolute_time != nullptr && *absolute_time != QString("")){ isObjectUpdated = true; break;}
-        if(elapsed_time != nullptr && *elapsed_time != QString("")){ isObjectUpdated = true; break;}
-        if(duration_time != nullptr && *duration_time != QString("")){ isObjectUpdated = true; break;}
+        if(file_name && *file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(absolute_time && *absolute_time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(elapsed_time && *elapsed_time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(duration_time && *duration_time != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileInputSettings.cpp
index 1341adfce..6c2a3eb5b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFileInputSettings.cpp
@@ -222,13 +222,27 @@ bool
 SWGFileInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_acceleration_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(file_name && *file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_acceleration_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp
index e4881b71f..880120a8b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp
@@ -246,14 +246,30 @@ bool
 SWGFileSourceReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_file_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_file_sample_size_isSet){ isObjectUpdated = true; break;}
-        if(absolute_time != nullptr && *absolute_time != QString("")){ isObjectUpdated = true; break;}
-        if(elapsed_time != nullptr && *elapsed_time != QString("")){ isObjectUpdated = true; break;}
-        if(duration_time != nullptr && *duration_time != QString("")){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
+        if(file_name && *file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_file_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_file_sample_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(absolute_time && *absolute_time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(elapsed_time && *elapsed_time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(duration_time && *duration_time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
index 101ab501c..78f00720b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp
@@ -324,18 +324,42 @@ bool
 SWGFileSourceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_filter_chain_hash_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_db_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(file_name && *file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_filter_chain_hash_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodReport.cpp
index 7e810b669..9363be157 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGFreeDVDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp
index 5e0c7e928..d6a6474b6 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp
@@ -384,21 +384,51 @@ bool
 SWGFreeDVDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_in_isSet){ isObjectUpdated = true; break;}
-        if(m_span_log2_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_free_dv_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_in_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_span_log2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_free_dv_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVModReport.cpp
index 8a4ca9c0f..ec12f5d97 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVModReport.cpp
@@ -138,9 +138,15 @@ bool
 SWGFreeDVModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
index d8ecc7b80..2bd72ee6f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp
@@ -446,24 +446,60 @@ bool
 SWGFreeDVModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_tone_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_span_log2_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_free_dv_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_mod_af_input_isSet){ isObjectUpdated = true; break;}
-        if(m_gauge_input_else_modem_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(cw_keyer != nullptr && cw_keyer->isSet()){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tone_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_span_log2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_free_dv_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_af_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gauge_input_else_modem_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(cw_keyer && cw_keyer->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
index f84f67e68..3946f994d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGFreqTrackerReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp
index 559b16008..d51996e40 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp
@@ -442,24 +442,60 @@ bool
 SWGFreqTrackerSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_alpha_ema_isSet){ isObjectUpdated = true; break;}
-        if(m_tracking_isSet){ isObjectUpdated = true; break;}
-        if(m_tracker_type_isSet){ isObjectUpdated = true; break;}
-        if(m_pll_psk_order_isSet){ isObjectUpdated = true; break;}
-        if(m_rrc_isSet){ isObjectUpdated = true; break;}
-        if(m_rrc_rolloff_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_alpha_ema_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tracking_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tracker_type_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pll_psk_order_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rrc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rrc_rolloff_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFrequency.cpp b/swagger/sdrangel/code/qt5/client/SWGFrequency.cpp
index b5d384b43..1cdd5e9f9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFrequency.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFrequency.cpp
@@ -98,7 +98,9 @@ bool
 SWGFrequency::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_frequency_isSet){ isObjectUpdated = true; break;}
+        if(m_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFrequencyBand.cpp b/swagger/sdrangel/code/qt5/client/SWGFrequencyBand.cpp
index 22142dc51..c54b3bc4a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFrequencyBand.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFrequencyBand.cpp
@@ -140,9 +140,15 @@ bool
 SWGFrequencyBand::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(m_lower_bound_isSet){ isObjectUpdated = true; break;}
-        if(m_higher_bound_isSet){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_lower_bound_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_higher_bound_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp
index 69d1e215f..bcc40d950 100644
--- a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp
@@ -138,9 +138,15 @@ bool
 SWGFrequencyRange::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_min_isSet){ isObjectUpdated = true; break;}
-        if(m_max_isSet){ isObjectUpdated = true; break;}
-        if(m_step_isSet){ isObjectUpdated = true; break;}
+        if(m_min_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_max_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_step_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp
index 245b80fb9..a6339ee49 100644
--- a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp
@@ -498,27 +498,69 @@ bool
 SWGGLSpectrum::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_fft_size_isSet){ isObjectUpdated = true; break;}
-        if(m_fft_overlap_isSet){ isObjectUpdated = true; break;}
-        if(m_m_fft_window_isSet){ isObjectUpdated = true; break;}
-        if(m_ref_level_isSet){ isObjectUpdated = true; break;}
-        if(m_power_range_isSet){ isObjectUpdated = true; break;}
-        if(m_display_waterfall_isSet){ isObjectUpdated = true; break;}
-        if(m_inverted_waterfall_isSet){ isObjectUpdated = true; break;}
-        if(m_display_max_hold_isSet){ isObjectUpdated = true; break;}
-        if(m_display_histogram_isSet){ isObjectUpdated = true; break;}
-        if(m_decay_isSet){ isObjectUpdated = true; break;}
-        if(m_display_grid_isSet){ isObjectUpdated = true; break;}
-        if(m_invert_isSet){ isObjectUpdated = true; break;}
-        if(m_display_grid_intensity_isSet){ isObjectUpdated = true; break;}
-        if(m_decay_divisor_isSet){ isObjectUpdated = true; break;}
-        if(m_histogram_stroke_isSet){ isObjectUpdated = true; break;}
-        if(m_display_current_isSet){ isObjectUpdated = true; break;}
-        if(m_display_trace_intensity_isSet){ isObjectUpdated = true; break;}
-        if(m_waterfall_share_isSet){ isObjectUpdated = true; break;}
-        if(m_averaging_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_averaging_value_isSet){ isObjectUpdated = true; break;}
-        if(m_linear_isSet){ isObjectUpdated = true; break;}
+        if(m_fft_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fft_overlap_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_m_fft_window_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ref_level_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_power_range_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_waterfall_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_inverted_waterfall_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_max_hold_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_histogram_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_decay_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_grid_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_invert_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_grid_intensity_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_decay_divisor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_histogram_stroke_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_current_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_display_trace_intensity_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_waterfall_share_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_averaging_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_averaging_value_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_linear_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGGain.cpp b/swagger/sdrangel/code/qt5/client/SWGGain.cpp
index 110db8f13..59d3556f1 100644
--- a/swagger/sdrangel/code/qt5/client/SWGGain.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGGain.cpp
@@ -98,7 +98,9 @@ bool
 SWGGain::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_gain_cb_isSet){ isObjectUpdated = true; break;}
+        if(m_gain_cb_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp
index 9f9b099b8..ec33f6872 100644
--- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp
@@ -422,23 +422,57 @@ bool
 SWGHackRFInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_vga_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_t_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_ext_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_t_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_ext_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp
index 921609203..8bf44c449 100644
--- a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp
@@ -340,19 +340,45 @@ bool
 SWGHackRFOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_vga_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_bias_t_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_ext_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vga_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bias_t_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_ext_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.cpp
index b39512315..0a1a77f76 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.cpp
@@ -92,7 +92,7 @@ SWGInstanceChannelsResponse::asJsonObject() {
     if(m_channelcount_isSet){
         obj->insert("channelcount", QJsonValue(channelcount));
     }
-    if(channels->size() > 0){
+    if(channels && channels->size() > 0){
         toJsonArray((QList<void*>*)channels, obj, "channels", "SWGChannelListItem");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGInstanceChannelsResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channelcount_isSet){ isObjectUpdated = true; break;}
-        if(channels->size() > 0){ isObjectUpdated = true; break;}
+        if(m_channelcount_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(channels && (channels->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceConfigResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceConfigResponse.cpp
index 7c8412e62..f08983601 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceConfigResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceConfigResponse.cpp
@@ -119,10 +119,10 @@ SWGInstanceConfigResponse::asJsonObject() {
     if((working_preset != nullptr) && (working_preset->isSet())){
         toJsonValue(QString("workingPreset"), working_preset, obj, QString("SWGPreset"));
     }
-    if(presets->size() > 0){
+    if(presets && presets->size() > 0){
         toJsonArray((QList<void*>*)presets, obj, "presets", "SWGPreset");
     }
-    if(commands->size() > 0){
+    if(commands && commands->size() > 0){
         toJsonArray((QList<void*>*)commands, obj, "commands", "SWGCommand");
     }
 
@@ -174,10 +174,18 @@ bool
 SWGInstanceConfigResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(preferences != nullptr && preferences->isSet()){ isObjectUpdated = true; break;}
-        if(working_preset != nullptr && working_preset->isSet()){ isObjectUpdated = true; break;}
-        if(presets->size() > 0){ isObjectUpdated = true; break;}
-        if(commands->size() > 0){ isObjectUpdated = true; break;}
+        if(preferences && preferences->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(working_preset && working_preset->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(presets && (presets->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(commands && (commands->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.cpp
index 8b0bce1ca..4f635fa31 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.cpp
@@ -92,7 +92,7 @@ SWGInstanceDevicesResponse::asJsonObject() {
     if(m_devicecount_isSet){
         obj->insert("devicecount", QJsonValue(devicecount));
     }
-    if(devices->size() > 0){
+    if(devices && devices->size() > 0){
         toJsonArray((QList<void*>*)devices, obj, "devices", "SWGDeviceListItem");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGInstanceDevicesResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_devicecount_isSet){ isObjectUpdated = true; break;}
-        if(devices->size() > 0){ isObjectUpdated = true; break;}
+        if(m_devicecount_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(devices && (devices->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
index a8c78f697..e1429b763 100644
--- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp
@@ -292,16 +292,36 @@ bool
 SWGInstanceSummaryResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(version != nullptr && *version != QString("")){ isObjectUpdated = true; break;}
-        if(qt_version != nullptr && *qt_version != QString("")){ isObjectUpdated = true; break;}
-        if(m_dsp_rx_bits_isSet){ isObjectUpdated = true; break;}
-        if(m_dsp_tx_bits_isSet){ isObjectUpdated = true; break;}
-        if(m_pid_isSet){ isObjectUpdated = true; break;}
-        if(appname != nullptr && *appname != QString("")){ isObjectUpdated = true; break;}
-        if(architecture != nullptr && *architecture != QString("")){ isObjectUpdated = true; break;}
-        if(os != nullptr && *os != QString("")){ isObjectUpdated = true; break;}
-        if(logging != nullptr && logging->isSet()){ isObjectUpdated = true; break;}
-        if(devicesetlist != nullptr && devicesetlist->isSet()){ isObjectUpdated = true; break;}
+        if(version && *version != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(qt_version && *qt_version != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_dsp_rx_bits_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dsp_tx_bits_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pid_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(appname && *appname != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(architecture && *architecture != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(os && *os != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(logging && logging->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(devicesetlist && devicesetlist->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGKiwiSDRReport.cpp b/swagger/sdrangel/code/qt5/client/SWGKiwiSDRReport.cpp
index 011f0da58..7e53b0885 100644
--- a/swagger/sdrangel/code/qt5/client/SWGKiwiSDRReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGKiwiSDRReport.cpp
@@ -98,7 +98,9 @@ bool
 SWGKiwiSDRReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_status_isSet){ isObjectUpdated = true; break;}
+        if(m_status_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGKiwiSDRSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGKiwiSDRSettings.cpp
index 4b764d918..a9ccf3ce9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGKiwiSDRSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGKiwiSDRSettings.cpp
@@ -284,16 +284,36 @@ bool
 SWGKiwiSDRSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_use_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(server_address != nullptr && *server_address != QString("")){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(server_address && *server_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp
index d290a8090..1671220e2 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp
@@ -318,18 +318,42 @@ bool
 SWGLimeSdrInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_success_isSet){ isObjectUpdated = true; break;}
-        if(m_stream_active_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_size_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_fill_isSet){ isObjectUpdated = true; break;}
-        if(m_underrun_count_isSet){ isObjectUpdated = true; break;}
-        if(m_overrun_count_isSet){ isObjectUpdated = true; break;}
-        if(m_dropped_packets_count_isSet){ isObjectUpdated = true; break;}
-        if(m_link_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_hw_timestamp_isSet){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_dir_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_pins_isSet){ isObjectUpdated = true; break;}
+        if(m_success_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_stream_active_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_fill_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_underrun_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_overrun_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dropped_packets_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_link_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_hw_timestamp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp
index 07bbeb39e..996e8cdd9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp
@@ -642,34 +642,90 @@ bool
 SWGLimeSdrInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_hard_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_soft_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_firbw_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_tia_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_pga_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_gpio_dir_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_pins_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_hard_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_soft_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_firbw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tia_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pga_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp
index d97e9dc29..1e50b1c3c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp
@@ -318,18 +318,42 @@ bool
 SWGLimeSdrOutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_success_isSet){ isObjectUpdated = true; break;}
-        if(m_stream_active_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_size_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_fill_isSet){ isObjectUpdated = true; break;}
-        if(m_underrun_count_isSet){ isObjectUpdated = true; break;}
-        if(m_overrun_count_isSet){ isObjectUpdated = true; break;}
-        if(m_dropped_packets_count_isSet){ isObjectUpdated = true; break;}
-        if(m_link_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_hw_timestamp_isSet){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_dir_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_pins_isSet){ isObjectUpdated = true; break;}
+        if(m_success_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_stream_active_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_fill_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_underrun_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_overrun_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dropped_packets_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_link_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_hw_timestamp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.cpp
index 7bb69811d..4a6977095 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.cpp
@@ -500,27 +500,69 @@ bool
 SWGLimeSdrOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_hard_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_soft_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_firbw_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_dir_isSet){ isObjectUpdated = true; break;}
-        if(m_gpio_pins_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_hard_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_soft_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_firbw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp
index ce354f9fb..2c6582946 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp
@@ -118,8 +118,12 @@ bool
 SWGLocalInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalInputSettings.cpp
index 80e5396f3..e50199720 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalInputSettings.cpp
@@ -222,13 +222,27 @@ bool
 SWGLocalInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp
index a17b41687..03b6bdc27 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp
@@ -118,8 +118,12 @@ bool
 SWGLocalOutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalOutputSettings.cpp
index f63916762..782e4553d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalOutputSettings.cpp
@@ -160,10 +160,18 @@ bool
 SWGLocalOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp
index 6948a2379..2337bd20a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp
@@ -282,16 +282,36 @@ bool
 SWGLocalSinkSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_local_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_filter_chain_hash_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_local_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_filter_chain_hash_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
index f4cc4c5d6..e8c55d908 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp
@@ -282,16 +282,36 @@ bool
 SWGLocalSourceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_local_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_filter_chain_hash_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_local_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_filter_chain_hash_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLocationInformation.cpp b/swagger/sdrangel/code/qt5/client/SWGLocationInformation.cpp
index 55321579a..d1c68fae8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLocationInformation.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLocationInformation.cpp
@@ -118,8 +118,12 @@ bool
 SWGLocationInformation::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_latitude_isSet){ isObjectUpdated = true; break;}
-        if(m_longitude_isSet){ isObjectUpdated = true; break;}
+        if(m_latitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_longitude_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGLoggingInfo.cpp b/swagger/sdrangel/code/qt5/client/SWGLoggingInfo.cpp
index 9627599df..4499317d4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGLoggingInfo.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGLoggingInfo.cpp
@@ -164,10 +164,18 @@ bool
 SWGLoggingInfo::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(console_level != nullptr && *console_level != QString("")){ isObjectUpdated = true; break;}
-        if(file_level != nullptr && *file_level != QString("")){ isObjectUpdated = true; break;}
-        if(m_dump_to_file_isSet){ isObjectUpdated = true; break;}
-        if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;}
+        if(console_level && *console_level != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(file_level && *file_level != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_dump_to_file_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_name && *file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMDemodReport.cpp
index b721c1473..2145bbeca 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMDemodReport.cpp
@@ -178,11 +178,21 @@ bool
 SWGNFMDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_ctcss_tone_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ctcss_tone_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp
index f8713ab64..0f855ffb7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp
@@ -484,26 +484,66 @@ bool
 SWGNFMDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_af_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_delta_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_ctcss_on_isSet){ isObjectUpdated = true; break;}
-        if(m_high_pass_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_ctcss_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_af_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_delta_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ctcss_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_high_pass_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ctcss_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMModReport.cpp
index c2c9b990d..4c3d740ee 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMModReport.cpp
@@ -138,9 +138,15 @@ bool
 SWGNFMModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
index dd4f1cc7d..c85b5666f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp
@@ -486,26 +486,66 @@ bool
 SWGNFMModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_af_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_tone_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_ctcss_on_isSet){ isObjectUpdated = true; break;}
-        if(m_ctcss_index_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_mod_af_input_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(cw_keyer != nullptr && cw_keyer->isSet()){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_af_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tone_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ctcss_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ctcss_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_af_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(cw_keyer && cw_keyer->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGNamedEnum.cpp b/swagger/sdrangel/code/qt5/client/SWGNamedEnum.cpp
index 8f34b5e62..c26084902 100644
--- a/swagger/sdrangel/code/qt5/client/SWGNamedEnum.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGNamedEnum.cpp
@@ -120,8 +120,12 @@ bool
 SWGNamedEnum::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(m_value_isSet){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_value_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusReport.cpp b/swagger/sdrangel/code/qt5/client/SWGPerseusReport.cpp
index 7f9ceee6b..26a405bd1 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPerseusReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPerseusReport.cpp
@@ -82,7 +82,7 @@ SWGPerseusReport::asJson ()
 QJsonObject*
 SWGPerseusReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(sample_rates->size() > 0){
+    if(sample_rates && sample_rates->size() > 0){
         toJsonArray((QList<void*>*)sample_rates, obj, "sampleRates", "SWGSampleRate");
     }
 
@@ -104,7 +104,9 @@ bool
 SWGPerseusReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(sample_rates->size() > 0){ isObjectUpdated = true; break;}
+        if(sample_rates && (sample_rates->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp
index 2c445dd05..6e8846a9a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp
@@ -382,21 +382,51 @@ bool
 SWGPerseusSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_index_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_adc_dither_isSet){ isObjectUpdated = true; break;}
-        if(m_adc_preamp_isSet){ isObjectUpdated = true; break;}
-        if(m_wide_band_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_attenuator_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_adc_dither_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_adc_preamp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_wide_band_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_attenuator_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputReport.cpp
index f885161eb..d8e1a2372 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputReport.cpp
@@ -160,10 +160,18 @@ bool
 SWGPlutoSdrInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_adc_rate_isSet){ isObjectUpdated = true; break;}
-        if(rssi != nullptr && *rssi != QString("")){ isObjectUpdated = true; break;}
-        if(m_gain_db_isSet){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
+        if(m_adc_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(rssi && *rssi != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp
index bea82cef5..258ee3a64 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp
@@ -582,31 +582,81 @@ bool
 SWGPlutoSdrInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_firbw_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fi_rlog2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_hw_bbdc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_hw_rfdc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_hw_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_firbw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fi_rlog2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_hw_bbdc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_hw_rfdc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_hw_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputReport.cpp
index 1eb195667..88b553f50 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputReport.cpp
@@ -140,9 +140,15 @@ bool
 SWGPlutoSdrOutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_dac_rate_isSet){ isObjectUpdated = true; break;}
-        if(rssi != nullptr && *rssi != QString("")){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
+        if(m_dac_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(rssi && *rssi != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp
index 1fdd22416..c6ddb314b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp
@@ -420,23 +420,57 @@ bool
 SWGPlutoSdrOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_firbw_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fi_rlog2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_fir_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_att_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_firbw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fi_rlog2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_fir_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_att_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPreferences.cpp b/swagger/sdrangel/code/qt5/client/SWGPreferences.cpp
index bbaaa8f38..5174855bc 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPreferences.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPreferences.cpp
@@ -286,16 +286,36 @@ bool
 SWGPreferences::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(source_device != nullptr && *source_device != QString("")){ isObjectUpdated = true; break;}
-        if(m_source_index_isSet){ isObjectUpdated = true; break;}
-        if(audio_type != nullptr && *audio_type != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device != nullptr && *audio_device != QString("")){ isObjectUpdated = true; break;}
-        if(m_latitude_isSet){ isObjectUpdated = true; break;}
-        if(m_longitude_isSet){ isObjectUpdated = true; break;}
-        if(m_console_min_log_level_isSet){ isObjectUpdated = true; break;}
-        if(m_use_log_file_isSet){ isObjectUpdated = true; break;}
-        if(log_file_name != nullptr && *log_file_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_file_min_log_level_isSet){ isObjectUpdated = true; break;}
+        if(source_device && *source_device != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_source_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(audio_type && *audio_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device && *audio_device != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_latitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_longitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_console_min_log_level_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_log_file_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(log_file_name && *log_file_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_file_min_log_level_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPreset.cpp b/swagger/sdrangel/code/qt5/client/SWGPreset.cpp
index e4fb7e95b..757647776 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPreset.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPreset.cpp
@@ -180,10 +180,10 @@ SWGPreset::asJsonObject() {
     if(m_iq_imbalance_correction_isSet){
         obj->insert("iqImbalanceCorrection", QJsonValue(iq_imbalance_correction));
     }
-    if(channel_configs->size() > 0){
+    if(channel_configs && channel_configs->size() > 0){
         toJsonArray((QList<void*>*)channel_configs, obj, "channelConfigs", "SWGChannelConfig");
     }
-    if(device_configs->size() > 0){
+    if(device_configs && device_configs->size() > 0){
         toJsonArray((QList<void*>*)device_configs, obj, "deviceConfigs", "SWGDeviceConfig");
     }
     if(layout != nullptr && *layout != QString("")){
@@ -298,16 +298,36 @@ bool
 SWGPreset::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_source_preset_isSet){ isObjectUpdated = true; break;}
-        if(group != nullptr && *group != QString("")){ isObjectUpdated = true; break;}
-        if(description != nullptr && *description != QString("")){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(spectrum_config != nullptr && spectrum_config->isSet()){ isObjectUpdated = true; break;}
-        if(m_dc_offset_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_imbalance_correction_isSet){ isObjectUpdated = true; break;}
-        if(channel_configs->size() > 0){ isObjectUpdated = true; break;}
-        if(device_configs->size() > 0){ isObjectUpdated = true; break;}
-        if(layout != nullptr && *layout != QString("")){ isObjectUpdated = true; break;}
+        if(m_source_preset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(group && *group != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(description && *description != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(spectrum_config && spectrum_config->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_offset_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_imbalance_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(channel_configs && (channel_configs->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(device_configs && (device_configs->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(layout && *layout != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetExport.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetExport.cpp
index d5e77d21e..91777f1ce 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetExport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetExport.cpp
@@ -122,8 +122,12 @@ bool
 SWGPresetExport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_path != nullptr && *file_path != QString("")){ isObjectUpdated = true; break;}
-        if(preset != nullptr && preset->isSet()){ isObjectUpdated = true; break;}
+        if(file_path && *file_path != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(preset && preset->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetGroup.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetGroup.cpp
index 8e50f727c..196622cec 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetGroup.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetGroup.cpp
@@ -104,7 +104,7 @@ SWGPresetGroup::asJsonObject() {
     if(m_nb_presets_isSet){
         obj->insert("nbPresets", QJsonValue(nb_presets));
     }
-    if(presets->size() > 0){
+    if(presets && presets->size() > 0){
         toJsonArray((QList<void*>*)presets, obj, "presets", "SWGPresetItem");
     }
 
@@ -146,9 +146,15 @@ bool
 SWGPresetGroup::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(group_name != nullptr && *group_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_nb_presets_isSet){ isObjectUpdated = true; break;}
-        if(presets->size() > 0){ isObjectUpdated = true; break;}
+        if(group_name && *group_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_presets_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(presets && (presets->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.cpp
index b61a708b5..f3c78d870 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.cpp
@@ -164,10 +164,18 @@ bool
 SWGPresetIdentifier::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(group_name != nullptr && *group_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(type != nullptr && *type != QString("")){ isObjectUpdated = true; break;}
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
+        if(group_name && *group_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(type && *type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetImport.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetImport.cpp
index 32da27d4e..d7de35b32 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetImport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetImport.cpp
@@ -144,9 +144,15 @@ bool
 SWGPresetImport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(group_name != nullptr && *group_name != QString("")){ isObjectUpdated = true; break;}
-        if(description != nullptr && *description != QString("")){ isObjectUpdated = true; break;}
-        if(file_path != nullptr && *file_path != QString("")){ isObjectUpdated = true; break;}
+        if(group_name && *group_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(description && *description != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(file_path && *file_path != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetItem.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetItem.cpp
index cbb568862..32b09b97d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetItem.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetItem.cpp
@@ -142,9 +142,15 @@ bool
 SWGPresetItem::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(type != nullptr && *type != QString("")){ isObjectUpdated = true; break;}
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(type && *type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresetTransfer.cpp b/swagger/sdrangel/code/qt5/client/SWGPresetTransfer.cpp
index 62d0e05cb..de3607cc5 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresetTransfer.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresetTransfer.cpp
@@ -120,8 +120,12 @@ bool
 SWGPresetTransfer::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_device_set_index_isSet){ isObjectUpdated = true; break;}
-        if(preset != nullptr && preset->isSet()){ isObjectUpdated = true; break;}
+        if(m_device_set_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(preset && preset->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGPresets.cpp b/swagger/sdrangel/code/qt5/client/SWGPresets.cpp
index 63ee4b712..dddd09f37 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPresets.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPresets.cpp
@@ -92,7 +92,7 @@ SWGPresets::asJsonObject() {
     if(m_nb_groups_isSet){
         obj->insert("nbGroups", QJsonValue(nb_groups));
     }
-    if(groups->size() > 0){
+    if(groups && groups->size() > 0){
         toJsonArray((QList<void*>*)groups, obj, "groups", "SWGPresetGroup");
     }
 
@@ -124,8 +124,12 @@ bool
 SWGPresets::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_nb_groups_isSet){ isObjectUpdated = true; break;}
-        if(groups->size() > 0){ isObjectUpdated = true; break;}
+        if(m_nb_groups_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(groups && (groups->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRDSReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRDSReport.cpp
index 8d11c2185..cdf189d45 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRDSReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRDSReport.cpp
@@ -218,7 +218,7 @@ SWGRDSReport::asJsonObject() {
     if(time != nullptr && *time != QString("")){
         toJsonValue(QString("time"), time, obj, QString("QString"));
     }
-    if(alt_frequencies->size() > 0){
+    if(alt_frequencies && alt_frequencies->size() > 0){
         toJsonArray((QList<void*>*)alt_frequencies, obj, "altFrequencies", "SWGRDSReport_altFrequencies");
     }
 
@@ -360,19 +360,45 @@ bool
 SWGRDSReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_demod_status_isSet){ isObjectUpdated = true; break;}
-        if(m_decod_status_isSet){ isObjectUpdated = true; break;}
-        if(m_rds_demod_accum_db_isSet){ isObjectUpdated = true; break;}
-        if(m_rds_demod_frequency_isSet){ isObjectUpdated = true; break;}
-        if(pid != nullptr && *pid != QString("")){ isObjectUpdated = true; break;}
-        if(pi_type != nullptr && *pi_type != QString("")){ isObjectUpdated = true; break;}
-        if(pi_coverage != nullptr && *pi_coverage != QString("")){ isObjectUpdated = true; break;}
-        if(prog_service_name != nullptr && *prog_service_name != QString("")){ isObjectUpdated = true; break;}
-        if(music_speech != nullptr && *music_speech != QString("")){ isObjectUpdated = true; break;}
-        if(mono_stereo != nullptr && *mono_stereo != QString("")){ isObjectUpdated = true; break;}
-        if(radio_text != nullptr && *radio_text != QString("")){ isObjectUpdated = true; break;}
-        if(time != nullptr && *time != QString("")){ isObjectUpdated = true; break;}
-        if(alt_frequencies->size() > 0){ isObjectUpdated = true; break;}
+        if(m_demod_status_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_decod_status_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rds_demod_accum_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rds_demod_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(pid && *pid != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(pi_type && *pi_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(pi_coverage && *pi_coverage != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(prog_service_name && *prog_service_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(music_speech && *music_speech != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(mono_stereo && *mono_stereo != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(radio_text && *radio_text != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(time && *time != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(alt_frequencies && (alt_frequencies->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRDSReport_altFrequencies.cpp b/swagger/sdrangel/code/qt5/client/SWGRDSReport_altFrequencies.cpp
index c1a9d6d77..cd1241136 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRDSReport_altFrequencies.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRDSReport_altFrequencies.cpp
@@ -98,7 +98,9 @@ bool
 SWGRDSReport_altFrequencies::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_frequency_isSet){ isObjectUpdated = true; break;}
+        if(m_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRange.cpp b/swagger/sdrangel/code/qt5/client/SWGRange.cpp
index 68f9bf28b..283971637 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRange.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRange.cpp
@@ -138,9 +138,15 @@ bool
 SWGRange::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_min_isSet){ isObjectUpdated = true; break;}
-        if(m_max_isSet){ isObjectUpdated = true; break;}
-        if(m_step_isSet){ isObjectUpdated = true; break;}
+        if(m_min_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_max_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_step_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRangeFloat.cpp b/swagger/sdrangel/code/qt5/client/SWGRangeFloat.cpp
index 8e9b05cf1..83af0a2e5 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRangeFloat.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRangeFloat.cpp
@@ -138,9 +138,15 @@ bool
 SWGRangeFloat::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_min_isSet){ isObjectUpdated = true; break;}
-        if(m_max_isSet){ isObjectUpdated = true; break;}
-        if(m_step_isSet){ isObjectUpdated = true; break;}
+        if(m_min_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_max_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_step_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp
index 5e1a1718c..31f71b830 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp
@@ -200,12 +200,24 @@ bool
 SWGRemoteInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_buffer_rw_balance_isSet){ isObjectUpdated = true; break;}
-        if(remote_timestamp != nullptr && *remote_timestamp != QString("")){ isObjectUpdated = true; break;}
-        if(m_min_nb_blocks_isSet){ isObjectUpdated = true; break;}
-        if(m_max_nb_recovery_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_buffer_rw_balance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(remote_timestamp && *remote_timestamp != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_min_nb_blocks_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_max_nb_recovery_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp
index 78fd5e072..f211d9b6d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp
@@ -306,17 +306,39 @@ bool
 SWGRemoteInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(api_address != nullptr && *api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_api_port_isSet){ isObjectUpdated = true; break;}
-        if(data_address != nullptr && *data_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_data_port_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(api_address && *api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(data_address && *data_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_data_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputReport.cpp
index c9a76ecae..fc7cf6ea7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputReport.cpp
@@ -118,8 +118,12 @@ bool
 SWGRemoteOutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_buffer_rw_balance_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_count_isSet){ isObjectUpdated = true; break;}
+        if(m_buffer_rw_balance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_count_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp
index 0cc50d7ad..6cd0ffca3 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp
@@ -364,20 +364,48 @@ bool
 SWGRemoteOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_tx_delay_isSet){ isObjectUpdated = true; break;}
-        if(m_nb_fec_blocks_isSet){ isObjectUpdated = true; break;}
-        if(api_address != nullptr && *api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_api_port_isSet){ isObjectUpdated = true; break;}
-        if(data_address != nullptr && *data_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_data_port_isSet){ isObjectUpdated = true; break;}
-        if(m_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tx_delay_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_fec_blocks_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(api_address && *api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(data_address && *data_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_data_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp
index 900904eca..b4f0a3c47 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp
@@ -344,19 +344,45 @@ bool
 SWGRemoteSinkSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_nb_fec_blocks_isSet){ isObjectUpdated = true; break;}
-        if(data_address != nullptr && *data_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_data_port_isSet){ isObjectUpdated = true; break;}
-        if(m_tx_delay_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_filter_chain_hash_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_nb_fec_blocks_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(data_address && *data_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_data_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tx_delay_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_filter_chain_hash_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceReport.cpp
index 60699f25e..25a8b261c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceReport.cpp
@@ -338,19 +338,45 @@ bool
 SWGRemoteSourceReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_queue_length_isSet){ isObjectUpdated = true; break;}
-        if(m_queue_size_isSet){ isObjectUpdated = true; break;}
-        if(m_samples_count_isSet){ isObjectUpdated = true; break;}
-        if(m_correctable_errors_count_isSet){ isObjectUpdated = true; break;}
-        if(m_uncorrectable_errors_count_isSet){ isObjectUpdated = true; break;}
-        if(m_tv_sec_isSet){ isObjectUpdated = true; break;}
-        if(m_tv_u_sec_isSet){ isObjectUpdated = true; break;}
-        if(m_nb_original_blocks_isSet){ isObjectUpdated = true; break;}
-        if(m_nb_fec_blocks_isSet){ isObjectUpdated = true; break;}
-        if(m_center_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_device_center_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_device_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_queue_length_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_queue_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_samples_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_correctable_errors_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_uncorrectable_errors_count_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tv_sec_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tv_u_sec_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_original_blocks_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nb_fec_blocks_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_center_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
index 6a332fa6d..63405b4c1 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp
@@ -264,15 +264,33 @@ bool
 SWGRemoteSourceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(data_address != nullptr && *data_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_data_port_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(data_address && *data_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_data_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRtlSdrReport.cpp
index 2b05d51f5..e717fe910 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrReport.cpp
@@ -82,7 +82,7 @@ SWGRtlSdrReport::asJson ()
 QJsonObject*
 SWGRtlSdrReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(gains->size() > 0){
+    if(gains && gains->size() > 0){
         toJsonArray((QList<void*>*)gains, obj, "gains", "SWGGain");
     }
 
@@ -104,7 +104,9 @@ bool
 SWGRtlSdrReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(gains->size() > 0){ isObjectUpdated = true; break;}
+        if(gains && (gains->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp
index 228fbb68e..da759530f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp
@@ -482,26 +482,66 @@ bool
 SWGRtlSdrSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_low_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_lo_ppm_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_imbalance_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_no_mod_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_offset_tuning_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_low_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lo_ppm_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_imbalance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_no_mod_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_offset_tuning_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlayReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlayReport.cpp
index 71326149d..7b1ceb2a7 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSDRPlayReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlayReport.cpp
@@ -121,16 +121,16 @@ SWGSDRPlayReport::asJson ()
 QJsonObject*
 SWGSDRPlayReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(sample_rates->size() > 0){
+    if(sample_rates && sample_rates->size() > 0){
         toJsonArray((QList<void*>*)sample_rates, obj, "sampleRates", "SWGSampleRate");
     }
-    if(bandwidths->size() > 0){
+    if(bandwidths && bandwidths->size() > 0){
         toJsonArray((QList<void*>*)bandwidths, obj, "bandwidths", "SWGBandwidth");
     }
-    if(intermediate_frequencies->size() > 0){
+    if(intermediate_frequencies && intermediate_frequencies->size() > 0){
         toJsonArray((QList<void*>*)intermediate_frequencies, obj, "intermediateFrequencies", "SWGFrequency");
     }
-    if(frequency_bands->size() > 0){
+    if(frequency_bands && frequency_bands->size() > 0){
         toJsonArray((QList<void*>*)frequency_bands, obj, "frequencyBands", "SWGFrequencyBand");
     }
 
@@ -182,10 +182,18 @@ bool
 SWGSDRPlayReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(sample_rates->size() > 0){ isObjectUpdated = true; break;}
-        if(bandwidths->size() > 0){ isObjectUpdated = true; break;}
-        if(intermediate_frequencies->size() > 0){ isObjectUpdated = true; break;}
-        if(frequency_bands->size() > 0){ isObjectUpdated = true; break;}
+        if(sample_rates && (sample_rates->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(bandwidths && (bandwidths->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(intermediate_frequencies && (intermediate_frequencies->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(frequency_bands && (frequency_bands->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp
index e6bc86dca..54ff818d3 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp
@@ -482,26 +482,66 @@ bool
 SWGSDRPlaySettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_tuner_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_frequency_band_index_isSet){ isObjectUpdated = true; break;}
-        if(m_if_frequency_index_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_index_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_index_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_tuner_gain_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_on_isSet){ isObjectUpdated = true; break;}
-        if(m_mixer_amp_on_isSet){ isObjectUpdated = true; break;}
-        if(m_baseband_gain_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tuner_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_frequency_band_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_if_frequency_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tuner_gain_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mixer_amp_on_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_baseband_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBDemodReport.cpp
index 580df19cc..78945dd4e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBDemodReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGSSBDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp
index 6562cc128..581b354e9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp
@@ -524,28 +524,72 @@ bool
 SWGSSBDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_low_cutoff_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_span_log2_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_binaural_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_flip_channels_isSet){ isObjectUpdated = true; break;}
-        if(m_dsb_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_clamping_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_time_log2_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_power_threshold_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_threshold_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_low_cutoff_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_span_log2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_binaural_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_flip_channels_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dsb_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_clamping_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_time_log2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_power_threshold_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_threshold_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBModReport.cpp
index 0cfe31310..9715f2553 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBModReport.cpp
@@ -138,9 +138,15 @@ bool
 SWGSSBModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
index ad8faecb5..a1e08dc7d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp
@@ -546,29 +546,75 @@ bool
 SWGSSBModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_low_cutoff_isSet){ isObjectUpdated = true; break;}
-        if(m_usb_isSet){ isObjectUpdated = true; break;}
-        if(m_tone_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_span_log2_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_binaural_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_flip_channels_isSet){ isObjectUpdated = true; break;}
-        if(m_dsb_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_mod_af_input_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(cw_keyer != nullptr && cw_keyer->isSet()){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_low_cutoff_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_usb_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tone_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_span_log2_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_binaural_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_flip_channels_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dsb_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_af_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(cw_keyer && cw_keyer->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSampleRate.cpp b/swagger/sdrangel/code/qt5/client/SWGSampleRate.cpp
index be66cf8ac..a414723b4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSampleRate.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSampleRate.cpp
@@ -98,7 +98,9 @@ bool
 SWGSampleRate::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp
index 1f2fdd882..617c4cd32 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp
@@ -284,16 +284,36 @@ bool
 SWGSamplingDevice::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_index_isSet){ isObjectUpdated = true; break;}
-        if(hw_type != nullptr && *hw_type != QString("")){ isObjectUpdated = true; break;}
-        if(m_direction_isSet){ isObjectUpdated = true; break;}
-        if(m_device_nb_streams_isSet){ isObjectUpdated = true; break;}
-        if(m_device_stream_index_isSet){ isObjectUpdated = true; break;}
-        if(m_sequence_isSet){ isObjectUpdated = true; break;}
-        if(serial != nullptr && *serial != QString("")){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(state != nullptr && *state != QString("")){ isObjectUpdated = true; break;}
+        if(m_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(hw_type && *hw_type != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_nb_streams_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_device_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sequence_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(serial && *serial != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(state && *state != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRFrequencySetting.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRFrequencySetting.cpp
index 6d168b426..43a9db96e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRFrequencySetting.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRFrequencySetting.cpp
@@ -94,7 +94,7 @@ SWGSoapySDRFrequencySetting::asJsonObject() {
     if(name != nullptr && *name != QString("")){
         toJsonValue(QString("name"), name, obj, QString("QString"));
     }
-    if(ranges->size() > 0){
+    if(ranges && ranges->size() > 0){
         toJsonArray((QList<void*>*)ranges, obj, "ranges", "SWGRangeFloat");
     }
 
@@ -126,8 +126,12 @@ bool
 SWGSoapySDRFrequencySetting::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(ranges->size() > 0){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(ranges && (ranges->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRGainSetting.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRGainSetting.cpp
index 450416f6d..0e4feac80 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRGainSetting.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRGainSetting.cpp
@@ -122,8 +122,12 @@ bool
 SWGSoapySDRGainSetting::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(name != nullptr && *name != QString("")){ isObjectUpdated = true; break;}
-        if(range != nullptr && range->isSet()){ isObjectUpdated = true; break;}
+        if(name && *name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(range && range->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp
index f52d4f087..26ccbe1df 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp
@@ -321,13 +321,13 @@ SWGSoapySDRInputSettings::asJsonObject() {
     if(m_bandwidth_isSet){
         obj->insert("bandwidth", QJsonValue(bandwidth));
     }
-    if(tunable_elements->size() > 0){
+    if(tunable_elements && tunable_elements->size() > 0){
         toJsonArray((QList<void*>*)tunable_elements, obj, "tunableElements", "SWGArgValue");
     }
     if(m_global_gain_isSet){
         obj->insert("globalGain", QJsonValue(global_gain));
     }
-    if(individual_gains->size() > 0){
+    if(individual_gains && individual_gains->size() > 0){
         toJsonArray((QList<void*>*)individual_gains, obj, "individualGains", "SWGArgValue");
     }
     if(m_auto_gain_isSet){
@@ -345,10 +345,10 @@ SWGSoapySDRInputSettings::asJsonObject() {
     if((iq_correction != nullptr) && (iq_correction->isSet())){
         toJsonValue(QString("iqCorrection"), iq_correction, obj, QString("SWGComplex"));
     }
-    if(stream_arg_settings->size() > 0){
+    if(stream_arg_settings && stream_arg_settings->size() > 0){
         toJsonArray((QList<void*>*)stream_arg_settings, obj, "streamArgSettings", "SWGArgValue");
     }
-    if(device_arg_settings->size() > 0){
+    if(device_arg_settings && device_arg_settings->size() > 0){
         toJsonArray((QList<void*>*)device_arg_settings, obj, "deviceArgSettings", "SWGArgValue");
     }
     if(m_use_reverse_api_isSet){
@@ -632,32 +632,84 @@ bool
 SWGSoapySDRInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_soft_dc_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_soft_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(antenna != nullptr && *antenna != QString("")){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(tunable_elements->size() > 0){ isObjectUpdated = true; break;}
-        if(m_global_gain_isSet){ isObjectUpdated = true; break;}
-        if(individual_gains->size() > 0){ isObjectUpdated = true; break;}
-        if(m_auto_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_dc_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(dc_correction != nullptr && dc_correction->isSet()){ isObjectUpdated = true; break;}
-        if(iq_correction != nullptr && iq_correction->isSet()){ isObjectUpdated = true; break;}
-        if(stream_arg_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(device_arg_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_soft_dc_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_soft_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(antenna && *antenna != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(tunable_elements && (tunable_elements->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_global_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(individual_gains && (individual_gains->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_dc_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(dc_correction && dc_correction->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(iq_correction && iq_correction->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(stream_arg_settings && (stream_arg_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(device_arg_settings && (device_arg_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp
index 18245dead..922c9fdab 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp
@@ -279,13 +279,13 @@ SWGSoapySDROutputSettings::asJsonObject() {
     if(m_bandwidth_isSet){
         obj->insert("bandwidth", QJsonValue(bandwidth));
     }
-    if(tunable_elements->size() > 0){
+    if(tunable_elements && tunable_elements->size() > 0){
         toJsonArray((QList<void*>*)tunable_elements, obj, "tunableElements", "SWGArgValue");
     }
     if(m_global_gain_isSet){
         obj->insert("globalGain", QJsonValue(global_gain));
     }
-    if(individual_gains->size() > 0){
+    if(individual_gains && individual_gains->size() > 0){
         toJsonArray((QList<void*>*)individual_gains, obj, "individualGains", "SWGArgValue");
     }
     if(m_auto_gain_isSet){
@@ -303,10 +303,10 @@ SWGSoapySDROutputSettings::asJsonObject() {
     if((iq_correction != nullptr) && (iq_correction->isSet())){
         toJsonValue(QString("iqCorrection"), iq_correction, obj, QString("SWGComplex"));
     }
-    if(stream_arg_settings->size() > 0){
+    if(stream_arg_settings && stream_arg_settings->size() > 0){
         toJsonArray((QList<void*>*)stream_arg_settings, obj, "streamArgSettings", "SWGArgValue");
     }
-    if(device_arg_settings->size() > 0){
+    if(device_arg_settings && device_arg_settings->size() > 0){
         toJsonArray((QList<void*>*)device_arg_settings, obj, "deviceArgSettings", "SWGArgValue");
     }
     if(m_use_reverse_api_isSet){
@@ -550,28 +550,72 @@ bool
 SWGSoapySDROutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_l_oppm_tenths_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
-        if(antenna != nullptr && *antenna != QString("")){ isObjectUpdated = true; break;}
-        if(m_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(tunable_elements->size() > 0){ isObjectUpdated = true; break;}
-        if(m_global_gain_isSet){ isObjectUpdated = true; break;}
-        if(individual_gains->size() > 0){ isObjectUpdated = true; break;}
-        if(m_auto_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_dc_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(dc_correction != nullptr && dc_correction->isSet()){ isObjectUpdated = true; break;}
-        if(iq_correction != nullptr && iq_correction->isSet()){ isObjectUpdated = true; break;}
-        if(stream_arg_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(device_arg_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_l_oppm_tenths_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_transverter_delta_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(antenna && *antenna != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(tunable_elements && (tunable_elements->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_global_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(individual_gains && (individual_gains->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_dc_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(dc_correction && dc_correction->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(iq_correction && iq_correction->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(stream_arg_settings && (stream_arg_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(device_arg_settings && (device_arg_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRReport.cpp
index f3780df7b..6b6f0e388 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRReport.cpp
@@ -217,10 +217,10 @@ SWGSoapySDRReport::asJson ()
 QJsonObject*
 SWGSoapySDRReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(device_settings_args->size() > 0){
+    if(device_settings_args && device_settings_args->size() > 0){
         toJsonArray((QList<void*>*)device_settings_args, obj, "deviceSettingsArgs", "SWGArgInfo");
     }
-    if(stream_settings_args->size() > 0){
+    if(stream_settings_args && stream_settings_args->size() > 0){
         toJsonArray((QList<void*>*)stream_settings_args, obj, "streamSettingsArgs", "SWGArgInfo");
     }
     if(m_has_dc_auto_correction_isSet){
@@ -235,7 +235,7 @@ SWGSoapySDRReport::asJsonObject() {
     if(m_has_frequency_correction_value_isSet){
         obj->insert("hasFrequencyCorrectionValue", QJsonValue(has_frequency_correction_value));
     }
-    if(antennas->size() > 0){
+    if(antennas && antennas->size() > 0){
         toJsonArray((QList<void*>*)antennas, obj, "antennas", "QString");
     }
     if(m_has_agc_isSet){
@@ -244,19 +244,19 @@ SWGSoapySDRReport::asJsonObject() {
     if((gain_range != nullptr) && (gain_range->isSet())){
         toJsonValue(QString("gainRange"), gain_range, obj, QString("SWGRangeFloat"));
     }
-    if(gain_settings->size() > 0){
+    if(gain_settings && gain_settings->size() > 0){
         toJsonArray((QList<void*>*)gain_settings, obj, "gainSettings", "SWGSoapySDRGainSetting");
     }
-    if(frequency_settings->size() > 0){
+    if(frequency_settings && frequency_settings->size() > 0){
         toJsonArray((QList<void*>*)frequency_settings, obj, "frequencySettings", "SWGSoapySDRFrequencySetting");
     }
-    if(frequency_settings_args->size() > 0){
+    if(frequency_settings_args && frequency_settings_args->size() > 0){
         toJsonArray((QList<void*>*)frequency_settings_args, obj, "frequencySettingsArgs", "SWGArgInfo");
     }
-    if(rates_ranges->size() > 0){
+    if(rates_ranges && rates_ranges->size() > 0){
         toJsonArray((QList<void*>*)rates_ranges, obj, "ratesRanges", "SWGRangeFloat");
     }
-    if(bandwidths_ranges->size() > 0){
+    if(bandwidths_ranges && bandwidths_ranges->size() > 0){
         toJsonArray((QList<void*>*)bandwidths_ranges, obj, "bandwidthsRanges", "SWGRangeFloat");
     }
 
@@ -408,20 +408,48 @@ bool
 SWGSoapySDRReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(device_settings_args->size() > 0){ isObjectUpdated = true; break;}
-        if(stream_settings_args->size() > 0){ isObjectUpdated = true; break;}
-        if(m_has_dc_auto_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_has_dc_offset_value_isSet){ isObjectUpdated = true; break;}
-        if(m_has_iq_balance_value_isSet){ isObjectUpdated = true; break;}
-        if(m_has_frequency_correction_value_isSet){ isObjectUpdated = true; break;}
-        if(antennas->size() > 0){ isObjectUpdated = true; break;}
-        if(m_has_agc_isSet){ isObjectUpdated = true; break;}
-        if(gain_range != nullptr && gain_range->isSet()){ isObjectUpdated = true; break;}
-        if(gain_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(frequency_settings->size() > 0){ isObjectUpdated = true; break;}
-        if(frequency_settings_args->size() > 0){ isObjectUpdated = true; break;}
-        if(rates_ranges->size() > 0){ isObjectUpdated = true; break;}
-        if(bandwidths_ranges->size() > 0){ isObjectUpdated = true; break;}
+        if(device_settings_args && (device_settings_args->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(stream_settings_args && (stream_settings_args->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_has_dc_auto_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_has_dc_offset_value_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_has_iq_balance_value_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_has_frequency_correction_value_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(antennas && (antennas->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(m_has_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(gain_range && gain_range->isSet()){
+            isObjectUpdated = true; break;
+        }
+        if(gain_settings && (gain_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(frequency_settings && (frequency_settings->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(frequency_settings_args && (frequency_settings_args->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(rates_ranges && (rates_ranges->size() > 0)){
+            isObjectUpdated = true; break;
+        }
+        if(bandwidths_ranges && (bandwidths_ranges->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGSuccessResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGSuccessResponse.cpp
index 34a93a011..a5f8c89dd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSuccessResponse.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSuccessResponse.cpp
@@ -100,7 +100,9 @@ bool
 SWGSuccessResponse::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(message != nullptr && *message != QString("")){ isObjectUpdated = true; break;}
+        if(message && *message != QString("")){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGTestMISettings.cpp b/swagger/sdrangel/code/qt5/client/SWGTestMISettings.cpp
index 61b234b9f..c0b5f49eb 100644
--- a/swagger/sdrangel/code/qt5/client/SWGTestMISettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGTestMISettings.cpp
@@ -136,7 +136,7 @@ SWGTestMISettings::asJsonObject() {
     if(m_reverse_api_device_index_isSet){
         obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
     }
-    if(streams->size() > 0){
+    if(streams && streams->size() > 0){
         toJsonArray((QList<void*>*)streams, obj, "streams", "SWGTestMiStreamSettings");
     }
 
@@ -208,12 +208,24 @@ bool
 SWGTestMISettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(streams->size() > 0){ isObjectUpdated = true; break;}
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(streams && (streams->size() > 0)){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGTestMiStreamSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGTestMiStreamSettings.cpp
index dd776e00c..c19024f0e 100644
--- a/swagger/sdrangel/code/qt5/client/SWGTestMiStreamSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGTestMiStreamSettings.cpp
@@ -418,23 +418,57 @@ bool
 SWGTestMiStreamSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_stream_index_isSet){ isObjectUpdated = true; break;}
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_frequency_shift_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_size_index_isSet){ isObjectUpdated = true; break;}
-        if(m_amplitude_bits_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_corr_options_isSet){ isObjectUpdated = true; break;}
-        if(m_modulation_isSet){ isObjectUpdated = true; break;}
-        if(m_modulation_tone_isSet){ isObjectUpdated = true; break;}
-        if(m_am_modulation_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_i_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_q_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_phase_imbalance_isSet){ isObjectUpdated = true; break;}
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_frequency_shift_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_size_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_amplitude_bits_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_corr_options_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_modulation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_modulation_tone_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_am_modulation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_i_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_q_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_phase_imbalance_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp
index 03ad9228a..ed9ac01c8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp
@@ -502,27 +502,69 @@ bool
 SWGTestSourceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_frequency_shift_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_fc_pos_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_size_index_isSet){ isObjectUpdated = true; break;}
-        if(m_amplitude_bits_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_corr_options_isSet){ isObjectUpdated = true; break;}
-        if(m_modulation_isSet){ isObjectUpdated = true; break;}
-        if(m_modulation_tone_isSet){ isObjectUpdated = true; break;}
-        if(m_am_modulation_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_i_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_q_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_phase_imbalance_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_frequency_shift_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fc_pos_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_size_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_amplitude_bits_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_corr_options_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_modulation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_modulation_tone_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_am_modulation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_i_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_q_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_phase_imbalance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkReport.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSinkReport.cpp
index 2ead91363..9ef5a82ee 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGUDPSinkReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_output_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_input_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_output_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_input_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp
index 73dcf0161..d55d6bea3 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp
@@ -564,30 +564,78 @@ bool
 SWGUDPSinkSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_output_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_sample_format_isSet){ isObjectUpdated = true; break;}
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_enabled_isSet){ isObjectUpdated = true; break;}
-        if(m_agc_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_active_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_stereo_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(udp_address != nullptr && *udp_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_udp_port_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_port_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_output_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_sample_format_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_enabled_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_agc_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_active_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_stereo_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(udp_address && *udp_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSourceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSourceReport.cpp
index c071c1b76..56817e1bd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSourceReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSourceReport.cpp
@@ -178,11 +178,21 @@ bool
 SWGUDPSourceReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_input_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_buffer_gauge_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_input_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_buffer_gauge_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
index ff2422d75..aa81d47ed 100644
--- a/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp
@@ -564,30 +564,78 @@ bool
 SWGUDPSourceSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_sample_format_isSet){ isObjectUpdated = true; break;}
-        if(m_input_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_low_cutoff_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_am_mod_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_in_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_out_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_gate_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_enabled_isSet){ isObjectUpdated = true; break;}
-        if(m_auto_rw_balance_isSet){ isObjectUpdated = true; break;}
-        if(m_stereo_input_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(udp_address != nullptr && *udp_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_udp_port_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_sample_format_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_input_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_low_cutoff_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_am_mod_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_in_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_out_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_gate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_enabled_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_auto_rw_balance_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_stereo_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(udp_address && *udp_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_udp_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMDemodReport.cpp
index b431b5645..bd20e5354 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMDemodReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMDemodReport.cpp
@@ -158,10 +158,18 @@ bool
 SWGWFMDemodReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp
index 7e3a3dc8a..d714abd1f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp
@@ -364,20 +364,48 @@ bool
 SWGWFMDemodSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_af_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_isSet){ isObjectUpdated = true; break;}
-        if(m_squelch_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_af_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_squelch_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMModReport.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMModReport.cpp
index a8b9d54aa..b406c9d81 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMModReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMModReport.cpp
@@ -138,9 +138,15 @@ bool
 SWGWFMModReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_channel_power_db_isSet){ isObjectUpdated = true; break;}
-        if(m_audio_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break;}
+        if(m_channel_power_db_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_audio_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
index 894dd60e7..e3e209532 100644
--- a/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp
@@ -446,24 +446,60 @@ bool
 SWGWFMModSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break;}
-        if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_af_bandwidth_isSet){ isObjectUpdated = true; break;}
-        if(m_fm_deviation_isSet){ isObjectUpdated = true; break;}
-        if(m_tone_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_volume_factor_isSet){ isObjectUpdated = true; break;}
-        if(m_channel_mute_isSet){ isObjectUpdated = true; break;}
-        if(m_play_loop_isSet){ isObjectUpdated = true; break;}
-        if(m_rgb_color_isSet){ isObjectUpdated = true; break;}
-        if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;}
-        if(audio_device_name != nullptr && *audio_device_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_mod_af_input_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;}
-        if(cw_keyer != nullptr && cw_keyer->isSet()){ isObjectUpdated = true; break;}
+        if(m_input_frequency_offset_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rf_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_af_bandwidth_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fm_deviation_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tone_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_volume_factor_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_channel_mute_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_play_loop_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_rgb_color_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(title && *title != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(audio_device_name && *audio_device_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_mod_af_input_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(cw_keyer && cw_keyer->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxInputReport.cpp
index fb737c3f4..f6e3eb032 100644
--- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputReport.cpp
@@ -178,11 +178,21 @@ bool
 SWGXtrxInputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_success_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_size_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_fill_isSet){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
-        if(m_gps_lock_isSet){ isObjectUpdated = true; break;}
+        if(m_success_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_fill_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gps_lock_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp
index c10d7c348..a145cc63c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp
@@ -542,29 +542,75 @@ bool
 SWGXtrxInputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_hard_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_dc_block_isSet){ isObjectUpdated = true; break;}
-        if(m_iq_correction_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_soft_decim_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_mode_isSet){ isObjectUpdated = true; break;}
-        if(m_lna_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_tia_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_pga_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_pwrmode_isSet){ isObjectUpdated = true; break;}
-        if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_hard_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dc_block_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_iq_correction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_soft_decim_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lna_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tia_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pga_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pwrmode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(file_record_name && *file_record_name != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxOutputReport.cpp
index c937121ed..627c0504f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGXtrxOutputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGXtrxOutputReport.cpp
@@ -178,11 +178,21 @@ bool
 SWGXtrxOutputReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_success_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_size_isSet){ isObjectUpdated = true; break;}
-        if(m_fifo_fill_isSet){ isObjectUpdated = true; break;}
-        if(m_temperature_isSet){ isObjectUpdated = true; break;}
-        if(m_gps_lock_isSet){ isObjectUpdated = true; break;}
+        if(m_success_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_size_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_fifo_fill_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gps_lock_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }
diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxOutputSettings.cpp
index f54a92909..be0b02155 100644
--- a/swagger/sdrangel/code/qt5/client/SWGXtrxOutputSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGXtrxOutputSettings.cpp
@@ -400,22 +400,54 @@ bool
 SWGXtrxOutputSettings::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_center_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_hard_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_log2_soft_interp_isSet){ isObjectUpdated = true; break;}
-        if(m_lpf_bw_isSet){ isObjectUpdated = true; break;}
-        if(m_gain_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_enable_isSet){ isObjectUpdated = true; break;}
-        if(m_nco_frequency_isSet){ isObjectUpdated = true; break;}
-        if(m_antenna_path_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_isSet){ isObjectUpdated = true; break;}
-        if(m_ext_clock_freq_isSet){ isObjectUpdated = true; break;}
-        if(m_pwrmode_isSet){ isObjectUpdated = true; break;}
-        if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
-        if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
-        if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
-        if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
+        if(m_center_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_dev_sample_rate_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_hard_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_log2_soft_interp_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lpf_bw_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gain_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_enable_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_nco_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_antenna_path_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_ext_clock_freq_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_pwrmode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_use_reverse_api_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(reverse_api_address && *reverse_api_address != QString("")){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_port_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_reverse_api_device_index_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }