diff -upr old/gmaps/includes/gmaps.address-element.inc patch/gmaps/includes/gmaps.address-element.inc
--- old/gmaps/includes/gmaps.address-element.inc	2010-06-04 15:09:09.000000000 +0200
+++ patch/gmaps/includes/gmaps.address-element.inc	2010-11-29 21:45:15.000000000 +0100
@@ -300,7 +300,7 @@ function _gmaps_address_pre_render($elem
   return $element;
 }
 
-function _gmaps_address_gmi(&$gmi, $value) {
+function _gmaps_address_gmi($gmi, $value) {
   $gmi->throttle = 0;
   $gmi->embedded = TRUE;
   
diff -upr old/gmaps/includes/gmaps.icon-admin.inc patch/gmaps/includes/gmaps.icon-admin.inc
--- old/gmaps/includes/gmaps.icon-admin.inc	2009-10-16 13:17:00.000000000 +0200
+++ patch/gmaps/includes/gmaps.icon-admin.inc	2010-11-29 21:58:16.000000000 +0100
@@ -653,7 +653,7 @@ function gmaps_icon_delete($icon) {
  *
  * @return array
  */
-function gmaps_icon_form(&$form_state, &$icon, &$info, $clone = FALSE) {
+function gmaps_icon_form(&$form_state, $icon, $info, $clone = FALSE) {
   $form = _gmaps_icon_form($form_state, $icon, $info, $clone);
   if ($clone) {
     $form['#validate'][] = '_gmaps_icon_form_validate_main';
@@ -726,7 +726,7 @@ function _gmaps_icon_get_types() {
 /**
  * Generates the icon editing form.
  */
-function _gmaps_icon_form(&$form_state, &$icon, &$info, $clone = FALSE) {
+function _gmaps_icon_form(&$form_state, $icon, $info, $clone = FALSE) {
   $form = array();
   $form['#has_gmaps_image_file'] = TRUE;
 
diff -upr old/gmaps/includes/gmaps.map-admin.inc patch/gmaps/includes/gmaps.map-admin.inc
--- old/gmaps/includes/gmaps.map-admin.inc	2010-05-18 16:45:57.000000000 +0200
+++ patch/gmaps/includes/gmaps.map-admin.inc	2010-11-29 21:57:55.000000000 +0100
@@ -900,7 +900,7 @@ function gmaps_map_delete($map) {
  *
  * @return array
  */
-function gmaps_map_form(&$form_state, &$map, &$info, $clone = FALSE) {
+function gmaps_map_form(&$form_state, $map, $info, $clone = FALSE) {
   $form = _gmaps_map_form($form_state, $map, $info, $clone);
   if ($clone) {
     $form['#validate'][] = '_gmaps_map_form_validate_main';
@@ -1199,7 +1199,7 @@ function _gmaps_map_get_defaults($info,
 /**
  * Generates the map editing form.
  */
-function _gmaps_map_form(&$form_state, &$map, &$info, $clone = FALSE) {
+function _gmaps_map_form(&$form_state, $map, $info, $clone = FALSE) {
   $form = array();
 
   $form['#gmaps_map'] = $map;
diff -upr old/gmaps/includes/gmaps.point-element.inc patch/gmaps/includes/gmaps.point-element.inc
--- old/gmaps/includes/gmaps.point-element.inc	2010-06-04 14:40:54.000000000 +0200
+++ patch/gmaps/includes/gmaps.point-element.inc	2010-11-29 21:40:30.000000000 +0100
@@ -492,7 +492,7 @@ function _gmaps_point_pre_render($elemen
   return $element;
 }
 
-function _gmaps_point_gmi(&$gmi, $element) {
+function _gmaps_point_gmi($gmi, $element) {
   $value = &$element['#value'];
   
   $gmi->throttle = 0;
diff -upr old/gmaps/includes/gmaps.static-map-admin.inc patch/gmaps/includes/gmaps.static-map-admin.inc
--- old/gmaps/includes/gmaps.static-map-admin.inc	2010-03-18 11:52:16.000000000 +0100
+++ patch/gmaps/includes/gmaps.static-map-admin.inc	2010-11-29 21:54:49.000000000 +0100
@@ -249,7 +249,7 @@ function gmaps_static_map_delete($map) {
  *
  * @return array
  */
-function gmaps_static_map_form(&$form_state, &$map, $clone = FALSE) {
+function gmaps_static_map_form(&$form_state, $map, $clone = FALSE) {
   $form = _gmaps_static_map_form($form_state, $map, $clone);
   $form['#validate'][] = '_gmaps_static_map_form_validate';
   if ($clone) {
@@ -386,7 +386,7 @@ function _gmaps_static_map_get_defaults(
 /**
  * Generates the map editing form.
  */
-function _gmaps_static_map_form(&$form_state, &$map, $clone = FALSE) {
+function _gmaps_static_map_form(&$form_state, $map, $clone = FALSE) {
   $form = array();
 
   $form['#gmaps_static_map'] = $map;
@@ -938,4 +938,4 @@ function _gmaps_static_map_format_option
   }
   
   return $formats;
-}
\ No newline at end of file
+}
diff -upr old/gmaps/modules/gmaps_content/theme/theme.inc patch/gmaps/modules/gmaps_content/theme/theme.inc
--- old/gmaps/modules/gmaps_content/theme/theme.inc	2010-02-26 15:13:03.000000000 +0100
+++ patch/gmaps/modules/gmaps_content/theme/theme.inc	2010-11-29 21:47:06.000000000 +0100
@@ -274,7 +274,7 @@ function _gmaps_content_map_cache_user_m
   return GMAPS_CACHE_NO_USER;
 }
 
-function _gmaps_content_field_gmi(&$gmi, $element, $field) {
+function _gmaps_content_field_gmi($gmi, $element, $field) {
   $gmi->overlays['marker'] = array();
   
   foreach(element_children($element) as $delta) {
diff -upr old/gmaps/modules/gmaps_devel/includes/gmaps_devel.map-form.inc patch/gmaps/modules/gmaps_devel/includes/gmaps_devel.map-form.inc
--- old/gmaps/modules/gmaps_devel/includes/gmaps_devel.map-form.inc	2009-09-14 09:57:58.000000000 +0200
+++ patch/gmaps/modules/gmaps_devel/includes/gmaps_devel.map-form.inc	2010-11-29 21:46:02.000000000 +0100
@@ -274,7 +274,7 @@ function _gmaps_devel_map_form_pre_rende
   return $form;
 }
 
-function gmaps_devel_map_form_gmi(&$gmi, $values) {
+function gmaps_devel_map_form_gmi($gmi, $values) {
   $values['point'] = (object)$values['point'];
   
   $content = &$values['content'];
@@ -350,4 +350,4 @@ function _gmaps_devel_map_form_prepare_g
     unset($content['tabs']);
   }
   return $content;
-}
\ No newline at end of file
+}
diff -upr old/gmaps/modules/gmaps_devel/includes/gmaps_devel.markers-form.inc patch/gmaps/modules/gmaps_devel/includes/gmaps_devel.markers-form.inc
--- old/gmaps/modules/gmaps_devel/includes/gmaps_devel.markers-form.inc	2009-11-23 14:23:48.000000000 +0100
+++ patch/gmaps/modules/gmaps_devel/includes/gmaps_devel.markers-form.inc	2010-11-29 21:46:29.000000000 +0100
@@ -134,7 +134,7 @@ function _gmaps_devel_markers_form_pre_r
   return $form;
 }
 
-function gmaps_devel_markers_form_gmi(&$gmi, $values) {
+function gmaps_devel_markers_form_gmi($gmi, $values) {
   if (empty($values['count']) || intval($values['count']) != $values['count'] || $values['count'] < 0) {
     return;
   }
diff -upr old/gmaps/modules/gmaps_term/theme/theme.inc patch/gmaps/modules/gmaps_term/theme/theme.inc
--- old/gmaps/modules/gmaps_term/theme/theme.inc	2010-04-01 09:42:10.000000000 +0200
+++ patch/gmaps/modules/gmaps_term/theme/theme.inc	2010-11-29 21:49:28.000000000 +0100
@@ -229,7 +229,7 @@ function theme_gmaps_term_formatter_stat
   return gmaps_static_map_item_render($options['map']['static_map'], '_gmaps_term_geo_data_smi', array($data, $data_type, $options), array(), 'term-data-'. $data->tid);
 }
 
-function _gmaps_term_geo_data_gmi(&$gmi, $data, $data_type, $options) {
+function _gmaps_term_geo_data_gmi($gmi, $data, $data_type, $options) {
   $gmi->overlays['marker'] = array();
   
   $term = taxonomy_get_term($data->tid);
diff -upr old/gmaps/modules/gmaps_user/theme/theme.inc patch/gmaps/modules/gmaps_user/theme/theme.inc
--- old/gmaps/modules/gmaps_user/theme/theme.inc	2010-04-01 09:42:11.000000000 +0200
+++ patch/gmaps/modules/gmaps_user/theme/theme.inc	2010-11-29 21:48:57.000000000 +0100
@@ -279,7 +279,7 @@ function theme_gmaps_user_formatter_stat
   return gmaps_static_map_item_render($geo['formatter']['map']['static_map'], '_gmaps_user_profile_smi', array($account, $geo), $cache, 'user-profile-'. $account->uid);
 }
 
-function _gmaps_user_profile_gmi(&$gmi, $account, $geo = NULL) {
+function _gmaps_user_profile_gmi($gmi, $account, $geo = NULL) {
   $gmi->overlays['marker'] = array();
   
   if (empty($geo)) {
diff -upr old/gmaps/modules/gmaps_views/includes/handlers/gmaps_views_plugin_style_map.inc patch/gmaps/modules/gmaps_views/includes/handlers/gmaps_views_plugin_style_map.inc
--- old/gmaps/modules/gmaps_views/includes/handlers/gmaps_views_plugin_style_map.inc	2010-05-18 16:45:57.000000000 +0200
+++ patch/gmaps/modules/gmaps_views/includes/handlers/gmaps_views_plugin_style_map.inc	2010-11-29 21:48:14.000000000 +0100
@@ -137,7 +137,7 @@ class gmaps_views_plugin_style_map exten
   }
 }
 
-function _gmaps_views_plugin_style_map_gmi(&$gmi, &$style, &$records) {
+function _gmaps_views_plugin_style_map_gmi($gmi, &$style, &$records) {
   foreach ($records as $index => $row) {
     $style->row_plugin->add_overlay($gmi, $row);
     $style->view->row_index++;