diff --git a/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ListView.swift b/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ListView.swift
index ab57c19..e11a4cf 100644
--- a/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ListView.swift
+++ b/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ListView.swift
@@ -63,7 +63,7 @@ extension Modern.ColorsDemo.SwiftUI {
                     }
                 }
             }
-            .animation(.default)
+//            .animation(.default) // breaks layout
             .listStyle(PlainListStyle())
             .edgesIgnoringSafeArea([])
         }
diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift
index ff56e49..0435907 100644
--- a/Sources/CoreStore+CustomDebugStringConvertible.swift
+++ b/Sources/CoreStore+CustomDebugStringConvertible.swift
@@ -1215,6 +1215,7 @@ extension NSAttributeType: CoreStoreDebugStringConvertible {
         case .objectIDAttributeType:        return ".objectIDAttributeType"
         case .UUIDAttributeType:            return ".UUIDAttributeType"
         case .URIAttributeType:             return ".URIAttributeType"
+        case .compositeAttributeType:       return ".compositeAttributeType"
         @unknown default:
             fatalError()
         }
diff --git a/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
index 17b7bd7..200fb2e 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
@@ -213,11 +213,11 @@ extension Internals.DiffableDataUIDispatcher {
 
         // Implementation based on https://github.com/ra1028/DifferenceKit
         @usableFromInline
-        internal struct Trace<Index> {
-            
+        internal struct Trace<I> {
+
             @usableFromInline
-            internal var reference: Index?
-            
+            internal var reference: I?
+
             @usableFromInline
             internal var deleteOffset = 0
             
diff --git a/Sources/Select.swift b/Sources/Select.swift
index 91c43c4..79e987c 100644
--- a/Sources/Select.swift
+++ b/Sources/Select.swift
@@ -503,8 +503,8 @@ public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hasha
     
     // MARK: Equatable
     
-    public static func == <T, U>(lhs: Select<O, T>, rhs: Select<O, U>) -> Bool {
-        
+    public static func == <T1, T2>(lhs: Select<O, T1>, rhs: Select<O, T2>) -> Bool {
+
         return lhs.selectTerms == rhs.selectTerms
     }
     
diff --git a/Sources/Where.swift b/Sources/Where.swift
index c8a9e75..6be2910 100644
--- a/Sources/Where.swift
+++ b/Sources/Where.swift
@@ -250,8 +250,8 @@ public struct Where<O: DynamicObject>: WhereClauseType, FetchClause, QueryClause
      - parameter keyPath: the keyPath to compare with
      - parameter object: the arguments for the `==` operator
      */
-    public init<O: DynamicObject>(_ keyPath: KeyPathString, isEqualTo object: O?) {
-        
+    public init<Other: DynamicObject>(_ keyPath: KeyPathString, isEqualTo object: Other?) {
+
         switch object {
             
         case nil: