diff --git a/subsites.blockvis.inc b/subsites.blockvis.inc
index b8becb4..e757305 100644
--- a/subsites.blockvis.inc
+++ b/subsites.blockvis.inc
@@ -33,7 +33,7 @@ function subsites_block_visibility($options) {
 function subsites_parse_block_visibility($code) {
   $matches = array();
   preg_match('/\$options = \'(.*)\';/', $code, $matches);
-  if (count($matches > 1)) {
+  if (count($matches) > 1) {
     return unserialize($matches[1]);
   }
 
@@ -44,6 +44,7 @@ function subsites_parse_block_visibility($code) {
  * Form alter -- Add an extra block visibility option to block add form.
  */
 function subsites_form_block_add_block_form_alter(&$form, $form_state) {
+  $form_id = $form['form_id']['#value'];
   subsites_form_alter_block_visibility($form, $form_state, $form_id);
 }
 
@@ -51,6 +52,7 @@ function subsites_form_block_add_block_form_alter(&$form, $form_state) {
  * Form alter -- Add an extra block visibility option to block configure form.
  */
 function subsites_form_block_admin_configure_alter(&$form, $form_state) {
+  $form_id = $form['form_id']['#value'];
   subsites_form_alter_block_visibility($form, $form_state, $form_id);
 }
 
@@ -58,7 +60,7 @@ function subsites_form_block_admin_configure_alter(&$form, $form_state) {
  * Form alter -- Add an extra block visibility option to block add or configure form.
  */
 function subsites_form_alter_block_visibility(&$form, $form_state, $form_id) {
-  $pages = $form['page_vis_settings']['pages']['#default_value'];
+  $pages = $form['visibility']['path']['pages']['#default_value'];
   $options = subsites_parse_block_visibility($pages);
 
   drupal_add_js(drupal_get_path('module', 'subsites') . '/subsites.js');