diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index ab3ff941..ffa6d5f6 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -66,7 +66,7 @@ SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_in
 ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -}
 ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{engines}}) -}
 ## FIXME: PROGRAMS might be too long, seperate it into 2 strings
-PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{programs}}) -}
+PROGRAMS={- our @PROGRAMS = map { $_.$exeext } @{$unified_info{programs}}; join(" ", @PROGRAMS) -}
 PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -}
 SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}
 {- output_off() if $disabled{makedepend}; "" -}
@@ -225,7 +225,8 @@ libclean:
 	-del /Q ossl_static.pdb
 
 clean: libclean
-	-del /Q /F $(PROGRAMS) $(ENGINES) $(SCRIPTS)
+	{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS); -}
+	-del /Q /F $(ENGINES) $(SCRIPTS)
 	-del /Q /F $(GENERATED)
 	-del /Q /S /F *.d
 	-del /Q /S /F *.obj
diff --git a/crypto/gmapi/gmapi_sdf_ec.c b/crypto/gmapi/gmapi_sdf_ec.c
index e910ff3a..fa41c9ff 100644
--- a/crypto/gmapi/gmapi_sdf_ec.c
+++ b/crypto/gmapi/gmapi_sdf_ec.c
@@ -305,7 +305,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
 {
 	SM2CiphertextValue *ret = NULL;
 	SM2CiphertextValue *cv = NULL;
-	EC_GROUP *group = NULL;
 
 	/* check arguments */
 	if (!ref) {
@@ -320,12 +319,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
 	}
 
 	/* ECCCipher => SM2CiphertextValue */
-	if (!(group = EC_GROUP_new_by_curve_name(NID_sm2p256v1))) {
-		GMAPIerr(GMAPI_F_SM2CIPHERTEXTVALUE_NEW_FROM_ECCCIPHER,
-			ERR_R_EC_LIB);
-		goto end;
-	}
-
 	if (!(cv = SM2CiphertextValue_new())) {
 		GMAPIerr(GMAPI_F_SM2CIPHERTEXTVALUE_NEW_FROM_ECCCIPHER,
 			GMAPI_R_MALLOC_FAILED);
@@ -342,7 +335,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
 	cv = NULL;
 
 end:
-	EC_GROUP_free(group);
 	SM2CiphertextValue_free(cv);
 	return ret;
 }