diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index edfe7b6..e6e0ddc 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -258,9 +258,9 @@ public function buildEntity(array $form, array &$form_state) {
     // "enabled" checkbox.
     $entity->hidden->value = (int) !$form_state['values']['enabled'];
     list($entity->menu_name->value, $entity->plid->target_id) = explode(':', $form_state['values']['parent']);
-    $attributes = $entity->options->value['attributes'];
+    $attributes = $entity->options[0]['attributes'];
     $attributes['title'] = $form_state['values']['description'];
-    $entity->options->value['attributes'] = $attributes;
+    $entity->options->setValue(array('attributes' => $attributes));
     return $entity;
   }
 
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
index 29da4a8..97aafee 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
@@ -38,13 +38,13 @@ public function form(array $form, array &$form_state) {
     foreach ($this->entity->links as $link) {
       $mlid = $link->id();
       $form['shortcuts']['links'][$mlid]['#attributes']['class'][] = 'draggable';
-      $form['shortcuts']['links'][$mlid]['name']['#markup'] = l($link->link_title, $link->link_path);
-      $form['shortcuts']['links'][$mlid]['#weight'] = $link->weight;
+      $form['shortcuts']['links'][$mlid]['name']['#markup'] = l($link->link_title->value, $link->link_path->value);
+      $form['shortcuts']['links'][$mlid]['#weight'] = $link->weight->value;
       $form['shortcuts']['links'][$mlid]['weight'] = array(
         '#type' => 'weight',
-        '#title' => t('Weight for @title', array('@title' => $link->link_title)),
+        '#title' => t('Weight for @title', array('@title' => $link->link_title->value)),
         '#title_display' => 'invisible',
-        '#default_value' => $link->weight,
+        '#default_value' => $link->weight->value,
         '#attributes' => array('class' => array('shortcut-weight')),
       );
 
@@ -88,7 +88,7 @@ protected function actions(array $form, array &$form_state) {
    */
   public function save(array $form, array &$form_state) {
     foreach ($this->entity->links as $link) {
-      $link->weight = $form_state['values']['shortcuts']['links'][$link->mlid]['weight'];
+      $link->weight = $form_state['values']['shortcuts']['links'][$link->id()]['weight'];
       $link->save();
     }
     drupal_set_message(t('The shortcut set has been updated.'));
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php
index 06088ef..2fcfa5b 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php
@@ -129,7 +129,7 @@ function generateShortcutLink($path, $title = '') {
   function getShortcutInformation($set, $key) {
     $info = array();
     foreach ($set->links as $uuid => $link) {
-      $info[] = $link->{$key};
+      $info[] = $link->{$key}->value;
     }
     return $info;
   }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
index ac5e151..c0aead7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
@@ -374,7 +374,7 @@ function testMenuHidden() {
 
     $links = array();
     foreach ($menu_links as $menu_link) {
-      $links[$menu_link->router_path] = $menu_link;
+      $links[$menu_link->router_path->value] = $menu_link;
     }
 
     $parent = $links['menu-test/hidden/menu'];
@@ -426,7 +426,7 @@ function testMenuHidden() {
 
     $links = array();
     foreach ($menu_links as $menu_link) {
-      $links[$menu_link->router_path] = $menu_link;
+      $links[$menu_link->router_path->value] = $menu_link;
     }
 
     $parent = $links['menu-test/hidden/block'];
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 769fc83..d3650fa 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -433,7 +433,7 @@ function theme_admin_block_content($variables) {
     }
     $output .= '<dl class="' . $class . '">';
     foreach ($content as $item) {
-      $output .= '<dt>' . l($item['title'], $item['href'], $item['localized_options']->getValue()) . '</dt>';
+      $output .= '<dt>' . l($item['title'], $item['href'], is_object($item['localized_options']) ? $item['localized_options']->getValue() : $item['localized_options']) . '</dt>';
       if (!$compact && isset($item['description'])) {
         $output .= '<dd>' . filter_xss_admin($item['description']) . '</dd>';
       }