diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java
index 9fe58ba0..16a083d2 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java
@@ -1486,7 +1486,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
 
 		String sql = getRequiredSql(operation);
 		Function<Connection, Statement> insertFunction = wrapPreparedOperation(sql, operation)
-				.andThen(statement -> statement.returnGeneratedValues());
+				.andThen(Statement::returnGeneratedValues);
 		Function<Connection, Flux<Result>> resultFunction = toFunction(sql, StatementFilterFunctions.empty(),
 				insertFunction);
 
diff --git a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
index 136b95a5..f23fd9f8 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -571,9 +571,9 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 
 		RelationalPersistentEntity<T> persistentEntity = getRequiredEntity(entity);
 
-		return maybeCallBeforeConvert(entity, tableName).flatMap(it -> {
+		return maybeCallBeforeConvert(entity, tableName).flatMap(onBeforeConvert -> {
 
-			T initializedEntity = setVersionIfNecessary(persistentEntity, it);
+			T initializedEntity = setVersionIfNecessary(persistentEntity, onBeforeConvert);
 
 			OutboundRow outboundRow = dataAccessStrategy.getOutboundRow(initializedEntity);
 
@@ -676,25 +676,25 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 
 		RelationalPersistentEntity<T> persistentEntity = getRequiredEntity(entity);
 
-		return maybeCallBeforeConvert(entity, tableName).flatMap(it -> {
+		return maybeCallBeforeConvert(entity, tableName).flatMap(onBeforeConvert -> {
 
 			T entityToUse;
 			Criteria matchingVersionCriteria;
 
 			if (persistentEntity.hasVersionProperty()) {
 
-				matchingVersionCriteria = createMatchingVersionCriteria(it, persistentEntity);
-				entityToUse = incrementVersion(persistentEntity, it);
+				matchingVersionCriteria = createMatchingVersionCriteria(onBeforeConvert, persistentEntity);
+				entityToUse = incrementVersion(persistentEntity, onBeforeConvert);
 			} else {
 
-				entityToUse = it;
+				entityToUse = onBeforeConvert;
 				matchingVersionCriteria = null;
 			}
 
 			OutboundRow outboundRow = dataAccessStrategy.getOutboundRow(entityToUse);
 
 			return maybeCallBeforeSave(entityToUse, outboundRow, tableName) //
-					.flatMap(entityToSave -> {
+					.flatMap(onBeforeSave -> {
 
 						SqlIdentifier idColumn = persistentEntity.getRequiredIdProperty().getColumnName();
 						Parameter id = outboundRow.remove(idColumn);
@@ -704,7 +704,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 							criteria = criteria.and(matchingVersionCriteria);
 						}
 
-						return doUpdate(entityToSave, tableName, persistentEntity, criteria, outboundRow);
+						return doUpdate(onBeforeSave, tableName, persistentEntity, criteria, outboundRow);
 					});
 		});
 	}
diff --git a/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java
index 39805581..a6f445f5 100644
--- a/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java
@@ -256,7 +256,7 @@ public class DefaultDatabaseClientUnitTests {
 	@Test // gh-390
 	void insertShouldWorkWithoutValues() {
 
-		Statement statement = mockStatementFor("INSERT INTO id_only VALUES ()");
+		Statement statement = mockStatementFor("INSERT INTO id_only VALUES (DEFAULT)");
 		DatabaseClient databaseClient = databaseClientBuilder.build();
 
 		databaseClient.insert().into("id_only") //
diff --git a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
index 7e58550e..b88c1b0d 100644
--- a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
@@ -22,7 +22,6 @@ import io.r2dbc.spi.test.MockColumnMetadata;
 import io.r2dbc.spi.test.MockResult;
 import io.r2dbc.spi.test.MockRow;
 import io.r2dbc.spi.test.MockRowMetadata;
-import lombok.ToString;
 import lombok.Value;
 import lombok.With;
 import reactor.core.publisher.Mono;