diff --git a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
index f42d17ba5..54dde0326 100644
--- a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
+++ b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
@@ -72,8 +72,8 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "Connect demo.dxfeed.com:7300 Quote &quot;ipf[https://demo:demo@tools.dxfeed.com/ipf?TYPE=STOCK&amp;compression=zip],APPL&quot;"
-            isEnabled = "NO">
+            argument = "Connect demo.dxfeed.com:7300 TimeAndSale &quot;ipf[https://demo:demo@tools.dxfeed.com/ipf?TYPE=STOCK&amp;compression=zip],APPL&quot;"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "Connect demo.dxfeed.com:7300 quote AAPL -f 2012-05-26-14:15:00"
@@ -93,7 +93,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "Dump tapeK2.tape[speed=max] -t ios_tapeK2.tape -q"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "LatencyTest mddqa.in.devexperts.com:7400 TimeAndSale ETH/USD:GDAX"
diff --git a/DXFeedFramework/Events/Market/OptionSale.swift b/DXFeedFramework/Events/Market/OptionSale.swift
index 90aaf1f6a..2bfb42c05 100644
--- a/DXFeedFramework/Events/Market/OptionSale.swift
+++ b/DXFeedFramework/Events/Market/OptionSale.swift
@@ -249,7 +249,7 @@ price=\(price), \
 size=\(size), \
 bid=\(bidPrice), \
 ask=\(askPrice), \
-ESC=\(exchangeSaleConditions ?? "null"), \
+ESC='\(exchangeSaleConditions ?? "null")', \
 TTE=\(StringUtil.encodeChar(char: Int16(getTradeThroughExempt().unicodeScalars.first?.value ?? 0))), \
 side=\(aggressorSide), \
 spread=\(isSpreadLeg), \
diff --git a/DXFeedFramework/Events/Market/Order.swift b/DXFeedFramework/Events/Market/Order.swift
index dc253d050..3c1051e3a 100644
--- a/DXFeedFramework/Events/Market/Order.swift
+++ b/DXFeedFramework/Events/Market/Order.swift
@@ -27,7 +27,7 @@ public class Order: OrderBase {
         return
 """
 Order{\(baseFieldsToString()), \
-marketMaker=\(marketMaker ?? "null")}
+marketMaker='\(marketMaker ?? "null")'}
 """
     }
 }
diff --git a/DXFeedFramework/Events/Market/SpreadOrder.swift b/DXFeedFramework/Events/Market/SpreadOrder.swift
index 9cadfcd4e..b24692801 100644
--- a/DXFeedFramework/Events/Market/SpreadOrder.swift
+++ b/DXFeedFramework/Events/Market/SpreadOrder.swift
@@ -37,7 +37,7 @@ public class SpreadOrder: OrderBase {
         return
 """
 SpreadOrder{\(baseFieldsToString()), \
-spreadSymbol=\(spreadSymbol ?? "null")}
+spreadSymbol='\(spreadSymbol ?? "null")'}
 """
     }
 }
diff --git a/DXFeedFramework/Ipf/Live/DXInstrumentProfileCollector.swift b/DXFeedFramework/Ipf/Live/DXInstrumentProfileCollector.swift
index 3fe44f5d3..ba8daba20 100644
--- a/DXFeedFramework/Ipf/Live/DXInstrumentProfileCollector.swift
+++ b/DXFeedFramework/Ipf/Live/DXInstrumentProfileCollector.swift
@@ -121,4 +121,3 @@ public class DXInstrumentProfileCollector {
         return try native.setExecutor(nativeExecutor)
     }
 }
-