diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
index 9b67c22dd..2f062632d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
@@ -36,12 +36,12 @@ public final class DefaultUpdateQuery<T> implements UpdateQuery<T> {
   }
 
   @Override
-  public UpdateQuery<T> set(Query.Property property, Object value) {
+  public <P> UpdateQuery<T> set(Query.Property<P> property, P value) {
     return set(property.toString(), value);
   }
 
   @Override
-  public UpdateQuery<T> setNull(Query.Property property) {
+  public UpdateQuery<T> setNull(Query.Property<?> property) {
     return setNull(property.toString());
   }
 
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 1126b2026..01d3d1ccb 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -282,7 +282,7 @@ public abstract class TQRootBean<T, R> {
    *
    * @param properties the list of properties to fetch
    */
-  public final R select(Query.Property... properties) {
+  public final R select(Query.Property<?>... properties) {
     ((SpiQueryFetch) query).selectProperties(properties(properties));
     return root;
   }