diff --git a/src/Encrypt.c b/src/Encrypt.c
index 4f14c93..bd6f25a 100644
--- a/src/Encrypt.c
+++ b/src/Encrypt.c
@@ -269,7 +269,7 @@
 	case COSE_Algorithm_AES_GCM_192:
 		cbitKey = 192;
 		break;
-#endif USE_AES_GCM_192
+#endif
 
 #ifdef USE_AES_GCM_256
 	case COSE_Algorithm_AES_GCM_256:
@@ -365,16 +365,20 @@
 		break;
 #endif
 
-#ifdef USE_AES_GCM
 #ifdef USE_AES_GCM_128
 	case COSE_Algorithm_AES_GCM_128:
+		if (!AES_GCM_Decrypt(pcose, pbKey, cbitKey / 8, cn->v.bytes, cn->length, pbAuthData, cbAuthData, perr)) goto error;
+		break;
 #endif
+
 #ifdef USE_AES_GCM_192
 	case COSE_Algorithm_AES_GCM_192:
+		if (!AES_GCM_Decrypt(pcose, pbKey, cbitKey / 8, cn->v.bytes, cn->length, pbAuthData, cbAuthData, perr)) goto error;
+		break;
 #endif
+
 #ifdef USE_AES_GCM_256
 	case COSE_Algorithm_AES_GCM_256:
-#endif
 		if (!AES_GCM_Decrypt(pcose, pbKey, cbitKey / 8, cn->v.bytes, cn->length, pbAuthData, cbAuthData, perr)) goto error;
 		break;
 #endif
@@ -570,19 +574,23 @@
 		break;
 #endif
 
-#ifdef USE_AES_GCM
 #ifdef USE_AES_GCM_128
 	case COSE_Algorithm_AES_GCM_128:
-#endif
-#ifdef USE_AES_GCM_192
-	case COSE_Algorithm_AES_GCM_192:
-#endif
-#ifdef USE_AES_GCM_256
-	case COSE_Algorithm_AES_GCM_256:
-#endif
 		if (!AES_GCM_Encrypt(pcose, pbKey, cbKey, pbAuthData, cbAuthData, perr)) goto errorReturn;
 		break;
-#endif 
+#endif
+
+#ifdef USE_AES_GCM_192
+	case COSE_Algorithm_AES_GCM_192:
+		if (!AES_GCM_Encrypt(pcose, pbKey, cbKey, pbAuthData, cbAuthData, perr)) goto errorReturn;
+		break;
+#endif
+
+#ifdef USE_AES_GCM_256
+	case COSE_Algorithm_AES_GCM_256:
+		if (!AES_GCM_Encrypt(pcose, pbKey, cbKey, pbAuthData, cbAuthData, perr)) goto errorReturn;
+		break;
+#endif
 
 	default:
 		FAIL_CONDITION(COSE_ERR_UNKNOWN_ALGORITHM);
diff --git a/src/MacMessage.c b/src/MacMessage.c
index 74733ef..a6a9008 100644
--- a/src/MacMessage.c
+++ b/src/MacMessage.c
@@ -454,7 +454,7 @@
 		break;
 #endif
 
-#ifdef USE_HMAC_384_348
+#ifdef USE_HMAC_384_384
 	case COSE_Algorithm_HMAC_384_384:
 		if (!HMAC_Create(pcose, 384, 384, pbKey, cbKey, pbAuthData, cbAuthData, perr)) goto errorReturn;
 		break;
diff --git a/src/configure.h b/src/configure.h
index 64d41a2..e4706d4 100644
--- a/src/configure.h
+++ b/src/configure.h
@@ -20,8 +20,8 @@
 #define USE_AES_CCM_64_64_256
 #define USE_AES_CCM_16_128_128
 #define USE_AES_CCM_16_128_256
-//#define USE_AES_CCM_64_64_128
-//#define USE_AES_CCM_64_64_256
+#define USE_AES_CCM_64_128_128
+#define USE_AES_CCM_64_128_256
 
 #define INCLUDE_AES_CCM
 
@@ -84,9 +84,9 @@
 //  Define which of the signature algorithms are to be used
 //
 
-//#define USE_ECDSA_SHA_256
-//#define USE_ECDSA_SHA_384
-//#define USE_ECDSA_SHA_512
+#define USE_ECDSA_SHA_256
+#define USE_ECDSA_SHA_384
+#define USE_ECDSA_SHA_512
 
 
 #define USE_OPEN_SSL 1