diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/AlreadyEnhancedMarker.java b/ebean-querybean/src/main/java/io/ebean/typequery/AlreadyEnhancedMarker.java
index cc107a7bb..39340ddf8 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/AlreadyEnhancedMarker.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/AlreadyEnhancedMarker.java
@@ -9,10 +9,9 @@ import java.lang.annotation.Target;
  * Used to denote a query bean that has already been enhanced.
  * <p>
  * Used by the agent to detect already enhanced type query beans to skip enhancement processing.
- * </p>
  */
 @Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface AlreadyEnhancedMarker {
 
 }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java
index 918e0d1b4..92036e7eb 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java
@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
  * This is code generated by the query bean generator (annotation processor).
  */
 @Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface Generated {
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java
index d0a538ee5..10a7c7e58 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java
@@ -9,10 +9,9 @@ import java.lang.annotation.Target;
  * Used to denote a type query bean.
  * <p>
  * These are typically generated beans used to build queries using type safe query criteria.
- * </p>
  */
 @Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface TypeQueryBean {
 
   /**
diff --git a/ebean-querybean/src/test/resources/ebean.mf b/ebean-querybean/src/test/resources/ebean.mf
index 5c97580de..90beca56f 100644
--- a/ebean-querybean/src/test/resources/ebean.mf
+++ b/ebean-querybean/src/test/resources/ebean.mf
@@ -1,2 +1,4 @@
 entity-packages: org.example.domain
 querybean-packages: org.example.domain,org.querytest
+debug: 0
+synthetic: false