diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModelInputWizard.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModelInputWizard.java
index 9a4df5de..c86ba639 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModelInputWizard.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModelInputWizard.java
@@ -139,7 +139,7 @@ public class ModelInputWizard<T> extends Dialog {
                         .filter(page -> page.isStart)
                         .findFirst();
 
-        if (newPage.isEmpty()) {
+        if (!newPage.isPresent()) {
             return;
         }
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/RestCallPageSupplier.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/RestCallPageSupplier.java
index 2049073d..529e138d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/table/RestCallPageSupplier.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/RestCallPageSupplier.java
@@ -31,9 +31,10 @@ public class RestCallPageSupplier<T> implements PageSupplier<T> {
         return this.restCall.getEntityType();
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public Builder<T> newBuilder() {
-        return new RestCallBuilderAdapter<>(this.restCall.newBuilder());
+        return new RestCallBuilderAdapter(this.restCall.newBuilder());
     }
 
     public static final class RestCallBuilderAdapter<T> implements Builder<T> {