diff --git a/Aaru.Dto/DeviceDto.cs b/Aaru.Dto/DeviceDto.cs
index 3977a7708..026db0e5c 100644
--- a/Aaru.Dto/DeviceDto.cs
+++ b/Aaru.Dto/DeviceDto.cs
@@ -153,7 +153,7 @@ public class DeviceDto : DeviceReport
             {
                 SCSI.MultiMediaDevice.ModeSense2AData = null;
 
-                if(SCSI.MultiMediaDevice.Features != null) SCSI.MultiMediaDevice.Features.BinaryData = null;
+                SCSI.MultiMediaDevice.Features?.BinaryData = null;
 
                 if(SCSI.MultiMediaDevice.TestedMedia != null)
                 {
@@ -167,7 +167,7 @@ public class DeviceDto : DeviceReport
             SCSI.SequentialDevice = null;
         }
 
-        if(USB != null) USB.Descriptors = null;
+        USB?.Descriptors = null;
 
         Id                         = id;
         OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
diff --git a/Aaru.Gui/Controls/HexViewPanel.cs b/Aaru.Gui/Controls/HexViewPanel.cs
index 6200bb973..67f431c95 100644
--- a/Aaru.Gui/Controls/HexViewPanel.cs
+++ b/Aaru.Gui/Controls/HexViewPanel.cs
@@ -464,11 +464,11 @@ public class HexViewPanel : UserControl
 
     private void OnOffsetHeaderChanged()
     {
-        if(_offsetHeaderText != null) _offsetHeaderText.Text = OffsetHeader;
+        _offsetHeaderText?.Text = OffsetHeader;
     }
 
     private void OnAsciiHeaderChanged()
     {
-        if(_asciiHeaderText != null) _asciiHeaderText.Text = AsciiHeader;
+        _asciiHeaderText?.Text = AsciiHeader;
     }
 }
\ No newline at end of file