diff --git a/makerom/keyset.c b/makerom/keyset.c
index 66ebeff..a270d38 100644
--- a/makerom/keyset.c
+++ b/makerom/keyset.c
@@ -96,10 +96,8 @@ int LoadKeysFromResources(keys_struct *keys)
 			SetCurrentCommonKey(keys,0);
 	
 		// NCCH
-		keys->aes.normalKey = NULL;
-		keys->aes.systemFixedKey = NULL;
-		//SetNormalKey(keys,zeros_aesKey);
-		//SetSystemFixedKey(keys,(u8*)zeros_aesKey);
+		SetNormalKey(keys,zeros_aesKey);
+		SetSystemFixedKey(keys,zeros_aesKey);
 
 		/* RSA Keys */
 		keys->rsa.isFalseSign = true;		
diff --git a/makerom/ncch.c b/makerom/ncch.c
index 438940b..0cc87ec 100644
--- a/makerom/ncch.c
+++ b/makerom/ncch.c
@@ -49,8 +49,7 @@ int SignCXI(ncch_hdr *hdr, keys_struct *keys)
 
 int CheckCXISignature(ncch_hdr *hdr, u8 *pubk)
 {
-	int result = RsaSignVerify(GetNcchHdrData(hdr),GetNcchHdrDataLen(hdr),GetNcchHdrSig(hdr),pubk,NULL,RSA_2048_SHA256,CTR_RSA_VERIFY);
-	return result;
+	return RsaSignVerify(GetNcchHdrData(hdr), GetNcchHdrDataLen(hdr), GetNcchHdrSig(hdr), pubk, NULL, RSA_2048_SHA256, CTR_RSA_VERIFY);
 }
 
 // NCCH Build Functions