diff --git a/og_moderation.module b/og_moderation.module
index b209539..0fb92a9 100644
--- a/og_moderation.module
+++ b/og_moderation.module
@@ -26,11 +26,11 @@ function og_moderation_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['#node_edit_form'])) {
     if ($form['#node_edit_form'] && og_is_group_content_type('node', $form['#bundle'])) {
       if (isset($form['#node']->nid) && $gids = og_get_entity_groups('node', $form['#node'])) {
-        foreach($gids as $gid) {
-          if (og_user_access($gid, "access publishing options of " . $form['#bundle'] . " content")) {
+        foreach($gids['node'] as $id => $gid) {
+          if (og_user_access('node', $gid, "access publishing options of " . $form['#bundle'] . " content")) {
             $form['options']['#access'] = TRUE;
           }
-          if (og_user_access($gid, "access revisions options of " . $form['#bundle'] . " content")) {
+          if (og_user_access('node', $gid, "access revisions options of " . $form['#bundle'] . " content")) {
             $form['revision_information']['#access'] = TRUE;
           }
         }
@@ -67,8 +67,8 @@ function og_moderation_node_grants($account, $op) {
   if ($op == 'view' && $gids = og_get_entity_groups('user', $account)) {
     $types = (empty($types) || $reset == TRUE) ? node_permissions_get_configured_types() : $types;
     foreach($types as $type) {
-      foreach ($gids as $gid => $value) {
-        if (og_user_access($gid, "view any unpublished $type content")) {
+      foreach ($gids['node'] as $id => $gid) {
+        if (og_user_access('node', $gid, "view any unpublished $type content")) {
           $grants['og_view_any_unpublished_' . $type . '_content'] = array($gid);
         }
       }
@@ -98,8 +98,8 @@ function og_moderation_menu_alter(&$items) {
 
 function og_moderation_node_revision_access($node, $op = 'view') {
   if ($gids = og_get_entity_groups('node', $node)) {
-    foreach ($gids as $gid => $value) {
-      if (og_user_access($gid, "access revisions options of " . $node->type . " content")) {
+    foreach ($gids['node'] as $id => $gid) {
+      if (og_user_access('node', $gid, "access revisions options of " . $node->type . " content")) {
         return TRUE;
       }
     }