diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
index 0957cc60..5aa8dfc0 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
@@ -53,7 +53,7 @@ public class AuditingEventListener implements ApplicationListener<BeforeConvertE
    */
   public void onApplicationEvent(BeforeConvertEvent<Object> event) {
 
-    Object entity = event.getSource();
-    auditingHandlerFactory.getObject().markAudited(Optional.of(entity));
+    Optional.ofNullable(event.getSource())//
+            .ifPresent(it -> auditingHandlerFactory.getObject().markAudited(it));
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
index e7e560b0..38c512c8 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
@@ -86,9 +86,9 @@ public abstract class AbstractN1qlBasedQuery implements RepositoryQuery {
   public Object execute(Object[] parameters) {
     ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
 
-    ResultProcessor processor = this.queryMethod.getResultProcessor().withDynamicProjection(Optional.of(accessor));
+    ResultProcessor processor = this.queryMethod.getResultProcessor().withDynamicProjection(accessor);
     ReturnedType returnedType = processor.getReturnedType();
-    
+
     Class<?> typeToRead = returnedType.getTypeToRead();
     typeToRead = typeToRead == null ? returnedType.getDomainType() : typeToRead;
 
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
index c883e345..016949ce 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
@@ -29,7 +29,7 @@ import com.couchbase.client.java.query.dsl.path.LimitPath;
 import com.couchbase.client.java.query.dsl.path.WherePath;
 
 /**
- * 
+ *
  * @author Mark Ramach
  * @author Mark Paluch
  */
@@ -55,7 +55,7 @@ public class N1qlCountQueryCreator extends N1qlQueryCreator {
 		}
 
 		public Pageable getPageable() {
-			return delegate.getPageable() != Pageable.NONE ? new CountPageable(delegate.getPageable()) : Pageable.NONE;
+			return delegate.getPageable().isPaged() ? new CountPageable(delegate.getPageable()) : Pageable.unpaged();
 		}
 
 		public Sort getSort() {
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
index 840495a2..15cb0bc8 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
@@ -132,7 +132,7 @@ public class N1qlQueryCreator extends AbstractQueryCreator<LimitPath, Expression
     OrderByPath selectFromWhere = selectFrom.where(whereCriteria);
 
     //sort of the Pageable takes precedence over the sort in the query name
-    if ((queryMethod.isPageQuery() || queryMethod.isSliceQuery()) && !Pageable.NONE.equals(accessor.getPageable())) {
+    if ((queryMethod.isPageQuery() || queryMethod.isSliceQuery()) && accessor.getPageable().isPaged()) {
       Pageable pageable = accessor.getPageable();
         sort = pageable.getSort();
     }
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
index 598cc958..61bf88a4 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
@@ -87,7 +87,7 @@ public class PartTreeN1qlBasedQuery extends AbstractN1qlBasedQuery {
       Pageable pageable = accessor.getPageable();
       Assert.notNull(pageable, "Pageable must not be null!");
       return selectFromWhereOrderBy.limit(pageable.getPageSize()).offset(Math.toIntExact(pageable.getOffset()));
-    } else if (queryMethod.isSliceQuery() && accessor.getPageable() != Pageable.NONE) {
+    } else if (queryMethod.isSliceQuery() && accessor.getPageable().isPaged()) {
       Pageable pageable = accessor.getPageable();
       Assert.notNull(pageable, "Pageable must not be null!");
       return selectFromWhereOrderBy.limit(pageable.getPageSize() + 1).offset(Math.toIntExact(pageable.getOffset()));
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
index d8660194..9f230f75 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
@@ -52,7 +52,7 @@ public abstract class ReactiveAbstractN1qlBasedQuery implements RepositoryQuery
     @Override
     public Object execute(Object[] parameters) {
         ReactiveCouchbaseParameterAccessor accessor = new ReactiveCouchbaseParameterAccessor(queryMethod, parameters);
-        ResultProcessor processor = this.queryMethod.getResultProcessor().withDynamicProjection(Optional.of(accessor));
+        ResultProcessor processor = this.queryMethod.getResultProcessor().withDynamicProjection(accessor);
         ReturnedType returnedType = processor.getReturnedType();
 
         Class<?> typeToRead = returnedType.getTypeToRead();
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
index ac569aaf..4079a36b 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
@@ -151,7 +151,7 @@ public class PartTreeN1qBasedQueryTest {
 		when(couchbaseConverter.getTypeKey()).thenReturn("_class");
 		when(couchbaseConverter.convertForWriteIfNeeded(eq("value"))).thenReturn("value");
 
-		ResultProcessor processor = queryMethod.getResultProcessor().withDynamicProjection(Optional.of(accessor));
+		ResultProcessor processor = queryMethod.getResultProcessor().withDynamicProjection(accessor);
 
 		PartTreeN1qlBasedQuery query = new PartTreeN1qlBasedQuery(queryMethod, couchbaseOperations);
 		Statement statement = query.getStatement(accessor, null, processor.getReturnedType());
@@ -183,7 +183,7 @@ public class PartTreeN1qBasedQueryTest {
 		when(couchbaseOperations.getConverter().getMappingContext()).thenReturn(mappingContext);
 		when(couchbaseConverter.getTypeKey()).thenReturn("_class");
 
-		ResultProcessor processor = queryMethod.getResultProcessor().withDynamicProjection(Optional.of(accessor));
+		ResultProcessor processor = queryMethod.getResultProcessor().withDynamicProjection(accessor);
 
 		PartTreeN1qlBasedQuery query = new PartTreeN1qlBasedQuery(queryMethod, couchbaseOperations);
 		Statement statement = query.getStatement(accessor, null, processor.getReturnedType());
@@ -204,4 +204,4 @@ public class PartTreeN1qBasedQueryTest {
 		List<BeerDTO> findAllDtoedBy();
 
 	}
-}
\ No newline at end of file
+}