diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index f8e6d9c..6ddd4ea 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -73,7 +73,7 @@ function fieldable_panels_panes_entity_info() {
     'save callback' => 'fieldable_panels_panes_save',
     'deletion callback' => 'fieldable_panels_panes_delete',
 
-    // Entity translation support
+    // Entity translation support.
     'translation' => array(
       'entity_translation' => array(
         'class' => 'EntityTranslationFieldablePanelsPaneHandler',
@@ -83,7 +83,7 @@ function fieldable_panels_panes_entity_info() {
       ),
     ),
 
-    // Title module support
+    // Title module support.
     'field replacement' => array(
       'title' => array(
         'field' => array(
@@ -394,18 +394,18 @@ function fieldable_panels_panes_menu() {
 
   $items['admin/structure/fieldable-panels-panes/%fieldable_panels_pane_type'] = array(
     'title callback' => 'fieldable_panels_panes_entities_title',
-    'title arguments' => array(4),
+    'title arguments' => array(3),
     'page callback' => 'fieldable_panels_panes_entities_list_page',
-    'page arguments' => array(4),
+    'page arguments' => array(3),
     // 'type' => MENU_LOCAL_TASK,
   ) + $base;
 
   $items['admin/structure/fieldable-panels-panes/%fieldable_panels_pane_type/add'] = array(
     'title' => 'Add fieldable panels pane',
     'page callback' => 'fieldable_panels_panes_entities_add_page',
-    'page arguments' => array(4),
+    'page arguments' => array(3),
     'access callback' => 'fieldable_panels_panes_access',
-    'access arguments' => array('create', 4),
+    'access arguments' => array('create', 3),
     'type' => MENU_LOCAL_ACTION,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
   ) + $base;
diff --git a/tests/fpp.permissions.test b/tests/fpp.permissions.test
index 1d485d4..032b7f4 100644
--- a/tests/fpp.permissions.test
+++ b/tests/fpp.permissions.test
@@ -110,7 +110,7 @@ function testListPermission() {
   function testCreateBundlePermission() {
     // Create a user with the admin permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -150,7 +150,7 @@ function testCreateBundlePermission() {
   function testEditBundlePermission() {
     // Create a user with edit permission.
     $permissions = array(
-      'edit fieldable ' . $this->bundle,
+      "edit fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -166,8 +166,8 @@ function testEditBundlePermission() {
   function testCreateEditBundlePermission() {
     // Create a user with create & edit permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
-      'edit fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
+      "edit fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -200,8 +200,8 @@ function testCreateEditBundlePermission() {
   function testDeleteBundlePermission() {
     // Create a user with the admin permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
-      'delete fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
+      "delete fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);