diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 9799497..ebc9276 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -3280,7 +3280,7 @@
  * #MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE.
  *
  * \note This feature comes with a (potentially) higher RAM usage since:
- *       - All the key slots are allocated no matter if they are used of not.
+ *       - All the key slots are allocated no matter if they are used or not.
  *       - Each key buffer's length is #MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE bytes.
  *
  * Requires: MBEDTLS_PSA_CRYPTO_C
diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h
index f2d8498..df0ee50 100644
--- a/library/psa_crypto_core.h
+++ b/library/psa_crypto_core.h
@@ -157,9 +157,9 @@
     struct key_data {
 #if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
         uint8_t data[MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE];
-#else /* MBEDTLS_PSA_STATIC_KEY_SLOTS */
+#else
         uint8_t *data;
-#endif /* MBEDTLS_PSA_STATIC_KEY_SLOTS */
+#endif
         size_t bytes;
     } key;
 } psa_key_slot_t;
diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 723fc32..195f871 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -491,7 +491,7 @@
 #endif
 
 /* Helper macro for the PK module to check whether MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
- * is large enough to contain 4096 bits RSA key pairs. Of course this check is only
+ * is large enough to contain 4096-bit RSA key pairs. Of course this check is only
  * necessary if PK relies on PSA (i.e. MBEDTLS_USE_PSA_CRYPTO) to store and manage
  * the key. */
 #if defined(MBEDTLS_USE_PSA_CRYPTO)