diff --git a/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java b/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java
index 9566ac8de..9ec9ab591 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java
@@ -172,7 +172,7 @@ public static AS4ReceiptMessage create (@Nonnull final ESoapVersion eSoapVersion
                                           @Nonnull @Nonempty final String sMessageID,
                                           @Nullable final Ebms3UserMessage aEbms3UserMessage,
                                           @Nullable final Node aSoapDocument,
-                                          @Nonnull final boolean bShouldUseNonRepudiation)
+                                          final boolean bShouldUseNonRepudiation)
   {
     // Only for signed messages
     final ICommonsList <ReferenceType> aDSRefs = getAllDSigReferences (aSoapDocument);
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java b/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java
index eac5472c3..0131147fa 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java
@@ -76,7 +76,7 @@ public enum EMEPBinding implements IHasID <String>
   private final String m_sURI;
   private final int m_nRequiredLegs;
 
-  EMEPBinding (@Nonnull @Nonempty final String sID, @Nonnull @Nonempty final String sURI, @Nonnull final int nRequiredLegs)
+  EMEPBinding (@Nonnull @Nonempty final String sID, @Nonnull @Nonempty final String sURI, final int nRequiredLegs)
   {
     m_sID = sID;
     m_sURI = sURI;
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java
index 1060540da..44528f780 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java
@@ -62,7 +62,6 @@ public interface IPModeManager
    * @param aPMode
    *        The PMode to be created or updated.
    */
-  @Nonnull
   void createOrUpdatePMode (@Nonnull PMode aPMode);
 
   /**
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java
index 9797b874b..ff2fad3d3 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java
@@ -38,7 +38,6 @@
  *
  * @author Philip Helger
  */
-@Nonnull
 @MustImplementEqualsAndHashcode
 public class PMode extends AbstractBusinessObject implements IPMode
 {
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java
index e4b5f8b4f..49c997910 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java
@@ -128,7 +128,6 @@ public EChange updatePMode (@Nonnull final IPMode aPMode)
     return EChange.CHANGED;
   }
 
-  @Nonnull
   public void createOrUpdatePMode (@Nonnull final PMode aPMode)
   {
     ValueEnforcer.notNull (aPMode, "PMode");
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java
index ca5c95b7d..36d7136bb 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java
@@ -129,7 +129,6 @@ public EChange updatePMode (@Nonnull final IPMode aNewPMode)
     return EChange.CHANGED;
   }
 
-  @Nonnull
   public void createOrUpdatePMode (@Nonnull final PMode aPMode)
   {
     ValueEnforcer.notNull (aPMode, "PMode");
diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java
index d77e7e43b..c439e8474 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java
@@ -209,7 +209,7 @@ public final EChange setMaxSizeKB (@Nullable final Integer aMaxSizeKB)
    * @since 0.12.0
    */
   @Nonnull
-  public final EChange setMaxSizeKB (@Nullable final int nMaxSizeKB)
+  public final EChange setMaxSizeKB (final int nMaxSizeKB)
   {
     return setMaxSizeKB (Integer.valueOf (nMaxSizeKB));
   }