diff --git a/core/modules/migrate/src/Plugin/MigrateIdAuditInterface.php b/core/modules/migrate/src/Plugin/MigrateIdAuditInterface.php
index 2050b0d..6837068 100644
--- a/core/modules/migrate/src/Plugin/MigrateIdAuditInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateIdAuditInterface.php
@@ -20,6 +20,15 @@
   public function unsafeIdsExist(MigrateIdMapInterface $idMap);
 
   /**
+   * Get the subfield that contains the highest ID migrated by this
+   * destination.
+   *
+   * @return string
+   *   The field name.
+   */
+  public function getHighestIdField();
+
+  /**
    * Get the type ID of the entities this destination creates.
    *
    * @return string
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index fe0cc09..014f187 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -309,20 +309,16 @@ protected function getDefinitionFromEntity($key) {
    */
   protected function highestDestinationId() {
     $query = $this->storage->getQuery()
-      ->sort($this->getKey('id'), 'DESC')
+      ->sort($this->getHighestIdField(), 'DESC')
       ->range(0, 1);
     $found = $query->execute();
-    return (int)reset($found);
+    return (int) reset($found);
   }
 
   /**
-   * Get the ID subfield that contains the highest ID migrated by this
-   * destination.
-   *
-   * @return string
-   *   The field name.
+   * {@inheritdoc}
    */
-  protected function getHighestIdField() {
+  public function getHighestIdField() {
     return $this->getKey('id');
   }
 
@@ -336,9 +332,7 @@ protected function getHighestIdField() {
    *   Whether unsafe IDs exist.
    */
   public function unsafeIdsExist(MigrateIdMapInterface $idMap) {
-    if (isset($this->configuration['preserves_ids'])
-      && !$this->configuration['preserves_ids']
-    ) {
+    if (!empty($this->migration->getPluginDefinition()['preserves_ids'])) {
       // If IDs are not preserved, we can't have conflicts.
       return FALSE;
     }
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 8834b8d..2b6e30c 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -939,7 +939,7 @@ public function getMaxId($field) {
       ->orderBy($sqlField, 'DESC')
       ->range(0, 1);
     $found = $query->execute()->fetchField();
-    return (int)$found;
+    return (int) $found;
   }
 
 }
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index a091fa2..d757647 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -1136,7 +1136,7 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state
 
     $form = parent::buildForm($form, $form_state);
     $form['actions']['submit']['#submit'] = ['::submitConfirmIdConflictForm'];
-    $form['actions']['submit']['#value'] = $this->t('I acknowledge I may lose data, continue anyway');
+    $form['actions']['submit']['#value'] = $this->t('I acknowledge I may lose data, continue anyway.');
 
     $form['warning'] = [
       '#type' => 'markup',
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut.yml b/core/modules/shortcut/migration_templates/d7_shortcut.yml
index 2fe92fc..371e1d8 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut.yml
@@ -2,6 +2,7 @@ id: d7_shortcut
 label: Shortcut links
 migration_tags:
   - Drupal 7
+preserves_ids: false
 source:
   plugin: d7_shortcut
   constants:
@@ -20,7 +21,6 @@ process:
       - link_path
 destination:
   plugin: entity:shortcut
-  preserves_ids: false
 migration_dependencies:
   required:
     - d7_shortcut_set