Fix expiry when adding subkeys