diff --git a/handlers/views_handler_argument_many_to_one.inc b/handlers/views_handler_argument_many_to_one.inc
index cc887d4..d078e34 100644
--- a/handlers/views_handler_argument_many_to_one.inc
+++ b/handlers/views_handler_argument_many_to_one.inc
@@ -13,7 +13,7 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_many_to_one extends views_handler_argument {
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     $this->helper = new views_many_to_one_helper($this);
 
diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index 06c6f94..250702d 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -454,7 +454,7 @@ If you would like to have the characters %5B and %5D please use the html entity
    * @param $values
    *   An array of all objects returned from the query.
    */
-  function pre_render($values) { }
+  function pre_render(&$values) { }
 
   /**
    * Render the field.
diff --git a/includes/base.inc b/includes/base.inc
index 7522d9f..126bde3 100644
--- a/includes/base.inc
+++ b/includes/base.inc
@@ -42,7 +42,7 @@ class views_object {
    * Set default options on this object. Called by the constructor in a
    * complex chain to deal with backward compatibility.
    */
-  function options() { }
+  function options(&$options) { }
 
   /**
    * Set default options.
diff --git a/modules/comment/views_handler_field_node_new_comments.inc b/modules/comment/views_handler_field_node_new_comments.inc
index 11daebe..f724c12 100644
--- a/modules/comment/views_handler_field_node_new_comments.inc
+++ b/modules/comment/views_handler_field_node_new_comments.inc
@@ -45,7 +45,7 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
     $this->field_alias = $this->table . '_' . $this->field;
   }
 
-  function pre_render($values) {
+  function pre_render(&$values) {
     global $user;
     if (!$user->uid || empty($values)) {
       return;
diff --git a/modules/node/views_handler_filter_node_access.inc b/modules/node/views_handler_filter_node_access.inc
index f787aee..010a286 100644
--- a/modules/node/views_handler_filter_node_access.inc
+++ b/modules/node/views_handler_filter_node_access.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_access extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
   function can_expose() {
     return FALSE;
   }
diff --git a/modules/node/views_handler_filter_node_status.inc b/modules/node/views_handler_filter_node_status.inc
index 7047caa..a91b5c6 100644
--- a/modules/node/views_handler_filter_node_status.inc
+++ b/modules/node/views_handler_filter_node_status.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_status extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
 
   function query() {
     $table = $this->ensure_my_table();
diff --git a/modules/profile/views_handler_field_profile_list.inc b/modules/profile/views_handler_field_profile_list.inc
index df0f6d3..5090212 100644
--- a/modules/profile/views_handler_field_profile_list.inc
+++ b/modules/profile/views_handler_field_profile_list.inc
@@ -6,7 +6,7 @@ class views_handler_field_profile_list extends views_handler_field_prerender_lis
   /**
    * Break up our field into a proper list.
    */
-  function pre_render($values) {
+  function pre_render(&$values) {
     $this->items = array();
     foreach ($values as $value) {
       $field = $value->{$this->field_alias};
diff --git a/modules/system/views_handler_field_file.inc b/modules/system/views_handler_field_file.inc
index 0c5f4b2..82b06cd 100644
--- a/modules/system/views_handler_field_file.inc
+++ b/modules/system/views_handler_field_file.inc
@@ -6,7 +6,7 @@ class views_handler_field_file extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['filepath'] = 'filepath';
diff --git a/modules/taxonomy/views_handler_field_term_node_tid.inc b/modules/taxonomy/views_handler_field_term_node_tid.inc
index bc8fc92..8782939 100644
--- a/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -66,7 +66,7 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
     $this->add_additional_fields();
   }
 
-  function pre_render($values) {
+  function pre_render(&$values) {
     $this->field_alias = $this->aliases['vid'];
     $vids = array();
     foreach ($values as $result) {
diff --git a/modules/upload/views_handler_field_upload_description.inc b/modules/upload/views_handler_field_upload_description.inc
index 2b0ac18..ec6ad0c 100644
--- a/modules/upload/views_handler_field_upload_description.inc
+++ b/modules/upload/views_handler_field_upload_description.inc
@@ -26,7 +26,7 @@ class views_handler_field_upload_description extends views_handler_field {
     );
   }
 
-  function pre_render($values) {
+  function pre_render(&$values) {
     if (empty($this->options['link_to_file'])) {
       return;
     }
diff --git a/modules/upload/views_handler_field_upload_fid.inc b/modules/upload/views_handler_field_upload_fid.inc
index 32356c7..d7ae1d8 100644
--- a/modules/upload/views_handler_field_upload_fid.inc
+++ b/modules/upload/views_handler_field_upload_fid.inc
@@ -29,7 +29,7 @@ class views_handler_field_upload_fid extends views_handler_field_prerender_list
     );
   }
 
-  function pre_render($values) {
+  function pre_render(&$values) {
     $vids = array();
     $this->items = array();
 
diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index 42ff1c8..deb814a 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -6,7 +6,7 @@ class views_handler_field_user_name extends views_handler_field_user {
   /**
    * Add uid in the query so we can test for anonymous if needed.
    */
-  function init(&$view, &$data) {
+  function init(&$view, $data) {
     parent::init($view, $data);
     if (!empty($this->options['overwrite_anonymous'])) {
       $this->additional_fields['uid'] = 'uid';
diff --git a/modules/user/views_handler_field_user_roles.inc b/modules/user/views_handler_field_user_roles.inc
index c664630..e677f11 100644
--- a/modules/user/views_handler_field_user_roles.inc
+++ b/modules/user/views_handler_field_user_roles.inc
@@ -13,7 +13,7 @@ class views_handler_field_user_roles extends views_handler_field_prerender_list
     $this->field_alias = $this->aliases['uid'];
   }
 
-  function pre_render($values) {
+  function pre_render(&$values) {
     $uids = array();
     $this->items = array();
 
diff --git a/modules/user/views_handler_filter_user_name.inc b/modules/user/views_handler_filter_user_name.inc
index 8bf1a88..e978175 100644
--- a/modules/user/views_handler_filter_user_name.inc
+++ b/modules/user/views_handler_filter_user_name.inc
@@ -35,7 +35,7 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
     }
   }
 
-  function value_validate(&$form, &$form_state) {
+  function value_validate($form, &$form_state) {
     $values = drupal_explode_tags($form_state['values']['options']['value']);
     $uids = $this->validate_user_strings($form['value'], $values);
 
@@ -114,7 +114,7 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
     return $uids;
   }
 
-  function value_submit() {
+  function value_submit($form, &$form_state) {
     // prevent array filter from removing our anonymous user.
   }