diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/model/ClaimSet.java b/openid-connect-common/src/main/java/org/mitre/jwt/model/ClaimSet.java
index c96e49f12..7939980c9 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/model/ClaimSet.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/model/ClaimSet.java
@@ -226,7 +226,7 @@ public class ClaimSet {
 
 	public void loadFromClaimSet(ClaimSet claimSet) {
 		
-		loadFromJsonObject(getAsJsonObject()); // we push to a JSON object and back to let subclasses override this
+		loadFromJsonObject(claimSet.getAsJsonObject()); // we push to a JSON object and back to let subclasses override this
 
 		jsonString = claimSet.toJsonString(); // preserve the string on input
 		
diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/model/Jwt.java b/openid-connect-common/src/main/java/org/mitre/jwt/model/Jwt.java
index 31a226eeb..8d2af5ee1 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/model/Jwt.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/model/Jwt.java
@@ -38,9 +38,9 @@ public class Jwt {
 	
 	
 	public Jwt() {
-	    this.header = new JwtHeader();
-	    this.claims = new JwtClaims();
-	    this.signature = null; // unsigned by default
+	    setHeader(new JwtHeader());
+	    setClaims(new JwtClaims());
+	    setSignature(null); // unsigned by default
     }
 
 
@@ -52,7 +52,6 @@ public class Jwt {
 	 * @param signature
 	 */
 	public Jwt(JwtHeader header, JwtClaims claims, String signature) {
-	    super();
 	    setHeader(header);
 	    setClaims(claims);
 	    setSignature(signature);
diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/IdToken.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/IdToken.java
index 556cb4e9f..6419615ed 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/IdToken.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/IdToken.java
@@ -53,7 +53,7 @@ public class IdToken extends Jwt {
 	 * @param claims
 	 * @param signature
 	 */
-	public IdToken(JwtHeader header, JwtClaims claims, String signature) {
+	public IdToken(JwtHeader header, IdTokenClaims claims, String signature) {
 	    super(header, claims, signature);
     }