diff --git a/library/pkwrite.c b/library/pkwrite.c
index 4fa5424..b1b5f46 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -282,7 +282,7 @@
         bits = psa_get_key_bits( &attributes );
         psa_reset_key_attributes( &attributes );
 
-        curve = PSA_KEY_TYPE_GET_CURVE( key_type ) & 0xff0000;
+        curve = PSA_KEY_TYPE_GET_CURVE( key_type );
         if( curve == 0 )
             return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 63fbaed..203b6de 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -427,11 +427,6 @@
 mbedtls_ecp_group_id mbedtls_ecc_group_of_psa( psa_ecc_curve_t curve,
                                                size_t byte_length )
 {
-    if( ( curve & 0xffff ) != 0 )
-    {
-        if( PSA_BITS_TO_BYTES( curve & 0xffff ) != byte_length )
-            return( MBEDTLS_ECP_DP_NONE );
-    }
     switch( curve )
     {
         case PSA_ECC_CURVE_SECP_R1:
diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c
index 1389fd4..fa1214c 100644
--- a/library/psa_crypto_storage.c
+++ b/library/psa_crypto_storage.c
@@ -259,7 +259,9 @@
     uint8_t magic[PSA_KEY_STORAGE_MAGIC_HEADER_LENGTH];
     uint8_t version[4];
     uint8_t lifetime[sizeof( psa_key_lifetime_t )];
-    uint8_t type[sizeof( psa_key_type_t )];
+    uint8_t type[4]; /* Size=4 for a 2-byte type to keep the structure more
+                      * regular and aligned and to make potential future
+                      * extensibility easier. */
     uint8_t policy[sizeof( psa_key_policy_t )];
     uint8_t data_len[4];
     uint8_t key_data[];
@@ -276,7 +278,7 @@
     memcpy( storage_format->magic, PSA_KEY_STORAGE_MAGIC_HEADER, PSA_KEY_STORAGE_MAGIC_HEADER_LENGTH );
     PUT_UINT32_LE( 0, storage_format->version, 0 );
     PUT_UINT32_LE( attr->lifetime, storage_format->lifetime, 0 );
-    PUT_UINT32_LE( attr->type, storage_format->type, 0 );
+    PUT_UINT32_LE( (uint32_t) attr->type, storage_format->type, 0 );
     PUT_UINT32_LE( attr->policy.usage, storage_format->policy, 0 );
     PUT_UINT32_LE( attr->policy.alg, storage_format->policy, sizeof( uint32_t ) );
     PUT_UINT32_LE( attr->policy.alg2, storage_format->policy, 2 * sizeof( uint32_t ) );
@@ -302,6 +304,7 @@
     const psa_persistent_key_storage_format *storage_format =
         (const psa_persistent_key_storage_format *)storage_data;
     uint32_t version;
+    uint32_t type;
 
     if( storage_data_length < sizeof(*storage_format) )
         return( PSA_ERROR_STORAGE_FAILURE );
@@ -332,7 +335,11 @@
     }
 
     GET_UINT32_LE( attr->lifetime, storage_format->lifetime, 0 );
-    GET_UINT32_LE( attr->type, storage_format->type, 0 );
+    GET_UINT32_LE( type, storage_format->type, 0 );
+    if( type <= (psa_key_type_t) -1 )
+        attr->type = (psa_key_type_t) type;
+    else
+        return( PSA_ERROR_STORAGE_FAILURE );
     GET_UINT32_LE( attr->policy.usage, storage_format->policy, 0 );
     GET_UINT32_LE( attr->policy.alg, storage_format->policy, sizeof( uint32_t ) );
     GET_UINT32_LE( attr->policy.alg2, storage_format->policy, 2 * sizeof( uint32_t ) );