diff --git a/SwiftTrace/SwiftArgs.swift b/SwiftTrace/SwiftArgs.swift
index 4440ab9..7bfb676 100644
--- a/SwiftTrace/SwiftArgs.swift
+++ b/SwiftTrace/SwiftArgs.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 John Holdsworth. All rights reserved.
 //
 //  Repo: https://github.com/johnno1962/SwiftTrace
-//  $Id: //depot/SwiftTrace/SwiftTrace/SwiftArgs.swift#87 $
+//  $Id: //depot/SwiftTrace/SwiftTrace/SwiftArgs.swift#88 $
 //
 //  Decorate trace with argument/return values
 //  ==========================================
@@ -57,6 +57,7 @@ extension OSRect: SwiftTraceFloatArg {}
 extension OSPoint: SwiftTraceFloatArg {}
 extension OSSize: SwiftTraceFloatArg {}
 extension CGFloat: SwiftTraceFloatArg {}
+extension OSEdgeInsets: SwiftTraceFloatArg {}
 #endif
 
 @_silgen_name("swift_getTypeName")
diff --git a/SwiftTrace/SwiftSwizzle.swift b/SwiftTrace/SwiftSwizzle.swift
index 7ec46f3..04b1dc1 100644
--- a/SwiftTrace/SwiftSwizzle.swift
+++ b/SwiftTrace/SwiftSwizzle.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 John Holdsworth. All rights reserved.
 //
 //  Repo: https://github.com/johnno1962/SwiftTrace
-//  $Id: //depot/SwiftTrace/SwiftTrace/SwiftSwizzle.swift#32 $
+//  $Id: //depot/SwiftTrace/SwiftTrace/SwiftSwizzle.swift#33 $
 //
 //  Mechanics of Swizzling Swift
 //  ============================
@@ -251,7 +251,9 @@ extension SwiftTrace {
             let returnType = methodSignature == nil ? "UNDECODABLE" :
                 String(cString: sig_returnType(methodSignature!))
             let isStret = returnType.hasPrefix("{") &&
-                !returnType.hasSuffix("=dd}") && !returnType.hasSuffix("=QQ}")
+                !returnType.hasSuffix("=ff}") &&
+                !returnType.hasSuffix("=dd}") &&
+                !returnType.hasSuffix("=QQ}")
             if isStret && !isReturn {
                 invocation.swiftSelf = intArgs[1]
             }
diff --git a/SwiftTrace/SwiftTrace.swift b/SwiftTrace/SwiftTrace.swift
index 7e606fe..3fe4a2f 100644
--- a/SwiftTrace/SwiftTrace.swift
+++ b/SwiftTrace/SwiftTrace.swift
@@ -109,9 +109,9 @@ open class SwiftTrace: NSObject {
      */
     open class var defaultMethodExclusions: String {
         return """
-            \\.getter| (?:retain|_tryRetain|release|autorelease|_isDeallocating|.cxx_destruct|dealloc|description| debugDescription)]|initWithCoder|\
+            \\.getter| (?:retain|_tryRetain|release|autorelease|_isDeallocating|.cxx_destruct|_?dealloc|description| debugDescription|contextID)]|initWithCoder|\
             ^\\+\\[(?:Reader_Base64|UI(?:NibStringIDTable|NibDecoder|CollectionViewData|WebTouchEventsGestureRecognizer)) |\
-            ^.\\[(?:UIView|RemoteCapture|BCEvent) |UIDeviceWhiteColor initWithWhite:alpha:|UIButton _defaultBackgroundImageForType:andState:|\
+            ^.\\[(?:__NSAtom|NSView|UIView|RemoteCapture|BCEvent) |UIDeviceWhiteColor initWithWhite:alpha:|UIButton _defaultBackgroundImageForType:andState:|\
             UIImage _initWithCompositedSymbolImageLayers:name:alignUsingBaselines:|\
             _UIWindowSceneDeviceOrientationSettingsDiffAction _updateDeviceOrientationWithSettingObserverContext:windowScene:transitionContext:|\
             UIColorEffect colorEffectSaturate:|UIWindow _windowWithContextId:|RxSwift.ScheduledDisposable.dispose| ns(?:li|is)_