diff --git a/subsites.admin.inc b/subsites.admin.inc
index 9c7becd..4b5397a 100644
--- a/subsites.admin.inc
+++ b/subsites.admin.inc
@@ -249,7 +249,7 @@ function subsites_content_nodes_form($form, $form_state, $subsite) {
  */
 function subsites_content_nodes_form_submit($form, &$form_state) {
   $matches = array();
-  eregi("\[nid:(.*)\]", $form_state['values']['nid'], $matches);
+  preg_match("/\[nid:(.*)\]/", $form_state['values']['nid'], $matches);
   if (isset($matches[1]) && is_numeric($matches[1])) {
     $nid = $matches[1];
 
@@ -278,7 +278,7 @@ function subsites_content_nodes_form_submit($form, &$form_state) {
 function subsites_add_node($string) {
   $matches = array();
   $result = db_select('node')
-              ->fields('node', array('title'))
+              ->fields('node', array('title', 'nid'))
               ->condition('title', db_like($string) . '%', 'LIKE')
               ->range(0, 10)->execute();
   foreach ($result as $row) {
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');