diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java
index 0d7f50d7..3a643727 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java
@@ -37,7 +37,7 @@ public class MyBatisContext {
 	private final @Nullable Class domainType;
 	private final Map<String, Object> additionalValues;
 
-	public MyBatisContext(@Nullable Object id, @Nullable Object instance, @Nullable Class domainType,
+	public MyBatisContext(@Nullable Object id, @Nullable Object instance, @Nullable Class<?> domainType,
 			Map<String, Object> additionalValues) {
 
 		this.id = id;
@@ -78,7 +78,7 @@ public class MyBatisContext {
 
 	/**
 	 * The entity to act upon. This is {@code null} for queries, since the object doesn't exist before the query.
-	 * 
+	 *
 	 * @return Might return {@code null}.
 	 */
 	@Nullable
diff --git a/spring-data-relational/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java b/spring-data-relational/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java
index a92d1124..6d62dc01 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java
@@ -27,7 +27,6 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.util.Assert;
@@ -145,7 +144,7 @@ public final class Identifier {
 	 */
 	public Map<SqlIdentifier, Object> toMap() {
 
-		Map<SqlIdentifier, Object> result = new StringKeyedLinkedHashMap<>();
+		Map<SqlIdentifier, Object> result = new StringKeyedLinkedHashMap<>(getParts().size());
 		forEach((name, value, type) -> result.put(name, value));
 		return result;
 	}
@@ -216,6 +215,10 @@ public final class Identifier {
 
 	private static class StringKeyedLinkedHashMap<V> extends LinkedHashMap<SqlIdentifier,V> {
 
+		public StringKeyedLinkedHashMap(int initialCapacity) {
+			super(initialCapacity);
+		}
+
 		@Override
 		public V get(Object key) {
 
@@ -227,6 +230,7 @@ public final class Identifier {
 					}
 				}
 			}
+
 			return super.get(key);
 		}
 	}