diff --git a/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php b/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
index 65f4f20..b39701f 100644
--- a/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
+++ b/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
@@ -43,10 +43,9 @@ function setUp() {
     $server_url = url('project_browser_test/query', array('absolute' => TRUE));
     $config = config('project_browser.settings');
     $config->set('server.default', array(
-      $server_url => array(
         'name' => 'Test Server',
         'method' => 'json',
-      ),
+        'url' => $server_url,
     ));
     $config->save();
 
diff --git a/core/modules/project_browser/project_browser.inc b/core/modules/project_browser/project_browser.inc
index f85b032..57118b9 100644
--- a/core/modules/project_browser/project_browser.inc
+++ b/core/modules/project_browser/project_browser.inc
@@ -193,7 +193,7 @@ function project_browser_get_server_widget(array $servers, $current_server) {
     'data' => t('Repository:'),
     'class' => array('server-header')
   );
-  $current_path = drupal_get_path_alias($_GET['q']);
+  $current_path = current_path();
 
   // @todo Improve comment or variable name of $i.
   // Interate through the repository number and current server number.
@@ -695,10 +695,10 @@ function project_browser_fetch_categories($type, $use_server = 'all') {
  *   project_browser_servers variable, in 'url => name' format.
  */
 function project_browser_get_servers($use_server = 'all') {
-  $servers = config('project_browser.settings')->get('server.default');
-  $url = $servers['url'];
-  unset($servers['url']);
-  $default_server[$url] = $servers;
+  $default_server = config('project_browser.settings')->get('server.default');
+  $url = $default_server['url'];
+  unset($default_server['url']);
+  $servers[$url] = $default_server;
   if ($servers_raw = config('project_browser.settings')->get('server.list')) {
     // Process the variable and add the servers to the list.
     $custom_servers = array();
diff --git a/core/modules/project_browser/project_browser.module b/core/modules/project_browser/project_browser.module
index 93f1e36..520f052 100644
--- a/core/modules/project_browser/project_browser.module
+++ b/core/modules/project_browser/project_browser.module
@@ -175,15 +175,15 @@ function project_browser_menu_local_tasks_alter(&$data, $router_item, $root_path
     // Put the 'Project Browser' action on the 'Modules' page.
     case 'admin/modules':
       // Unset the install theme page.
-      foreach ($data['actions']['output'] as $num => $item) {
+      foreach ($data['actions'] as $num => $item) {
         if ($item['#link']['path'] == 'admin/modules/install') {
-          unset($data['actions']['output'][$num]);
+          unset($data['actions'][$num]);
         }
       }
       $item = menu_get_item('admin/modules/project-browser/modules');
       if ($item['access']) {
         $item['title'] = t('Install new modules');
-        $data['actions']['output'][] = array(
+        $data['actions']['admin/modules/project-browser/modules'] = array(
           '#theme' => 'menu_local_action',
           '#link' => $item,
         );
@@ -197,7 +197,7 @@ function project_browser_menu_local_tasks_alter(&$data, $router_item, $root_path
       $item = menu_get_item('admin/modules/install');
       if ($item['access']) {
         $item['title'] = t('Install manually');
-        $data['actions']['output'][] = array(
+        $data['actions']['admin/modules/install'] = array(
           '#theme' => 'menu_local_action',
           '#link' => $item,
         );
@@ -207,15 +207,15 @@ function project_browser_menu_local_tasks_alter(&$data, $router_item, $root_path
     // Put the 'Project Browser' action on the 'Appearance' page.
     case 'admin/appearance':
       // Unset the install theme page.
-      foreach ($data['actions']['output'] as $num => $item) {
+      foreach ($data['actions'] as $num => $item) {
         if ($item['#link']['path'] == 'admin/appearance/install') {
-          unset($data['actions']['output'][$num]);
+          unset($data['actions'][$num]);
         }
       }
       $item = menu_get_item('admin/modules/project-browser/themes');
       if ($item['access']) {
         $item['title'] = t('Install new themes');
-        $data['actions']['output'][] = array(
+        $data['actions']['admin/modules/project-browser/themes'] = array(
           '#theme' => 'menu_local_action',
           '#link' => $item,
         );
diff --git a/core/modules/project_browser/project_browser.pages.inc b/core/modules/project_browser/project_browser.pages.inc
index 467d0ca..24f286a 100644
--- a/core/modules/project_browser/project_browser.pages.inc
+++ b/core/modules/project_browser/project_browser.pages.inc
@@ -25,7 +25,7 @@ function project_browser_page($type) {
 
   // Set any filters in the session that are needed.
   if (!empty($_GET['repository'])) {
-    $_SESSION['project_browser_sever_filter'] = $_GET['repository'];
+    $_SESSION['project_browser_server_filter'] = $_GET['repository'];
   }
   if (!empty($_GET['order_by'])) {
     $_SESSION['project_browser_order_by_filter_' . $type] = $_GET['order_by'];