diff --git a/modules/openlayers_views/plugins/layer_types/openlayers_views_vector.inc b/modules/openlayers_views/plugins/layer_types/openlayers_views_vector.inc
index 3eca4ed..a8f29da 100644
--- a/modules/openlayers_views/plugins/layer_types/openlayers_views_vector.inc
+++ b/modules/openlayers_views/plugins/layer_types/openlayers_views_vector.inc
@@ -33,7 +33,7 @@ class openlayers_layer_type_openlayers_views_vector
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
     );
   }
diff --git a/modules/openlayers_views/views/openlayers_views_style_data.inc b/modules/openlayers_views/views/openlayers_views_style_data.inc
index 9aa1346..95d96d6 100644
--- a/modules/openlayers_views/views/openlayers_views_style_data.inc
+++ b/modules/openlayers_views/views/openlayers_views_style_data.inc
@@ -21,8 +21,8 @@ class openlayers_views_style_data extends views_plugin_style {
    *
    * Overrides views_plugin_style->render
    */
-  function render($result) {
-    $grouped_results = $this->render_grouping($result, $this->options['grouping']);
+  function render() {
+    $grouped_results = $this->render_grouping($this->view->result, $this->options['grouping']);
     $data = $this->map_features($grouped_results);
 
     // If we are not in preview, just return the data
diff --git a/plugins/behaviors/openlayers_behavior_attribution.inc b/plugins/behaviors/openlayers_behavior_attribution.inc
index b3ef49d..d4981dc 100644
--- a/plugins/behaviors/openlayers_behavior_attribution.inc
+++ b/plugins/behaviors/openlayers_behavior_attribution.inc
@@ -35,7 +35,7 @@ class openlayers_behavior_attribution extends openlayers_behavior {
     return array('OpenLayers.Control.Attribution');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'seperator' => array(
         '#type' => 'textfield',
diff --git a/plugins/behaviors/openlayers_behavior_boxselect.inc b/plugins/behaviors/openlayers_behavior_boxselect.inc
index c78614b..c13f6e3 100644
--- a/plugins/behaviors/openlayers_behavior_boxselect.inc
+++ b/plugins/behaviors/openlayers_behavior_boxselect.inc
@@ -40,7 +40,7 @@ class openlayers_behavior_boxselect extends openlayers_behavior {
     );
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
     );
   }
diff --git a/plugins/behaviors/openlayers_behavior_cluster.inc b/plugins/behaviors/openlayers_behavior_cluster.inc
index 1765649..8430276 100644
--- a/plugins/behaviors/openlayers_behavior_cluster.inc
+++ b/plugins/behaviors/openlayers_behavior_cluster.inc
@@ -43,7 +43,7 @@ class openlayers_behavior_cluster extends openlayers_behavior {
   /**
    * Provide form for configurations per map.
    */
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     // Only prompt for vector layers
     $vector_layers = array();
     foreach ($this->map['layers'] as $id => $name) {
diff --git a/plugins/behaviors/openlayers_behavior_dragpan.inc b/plugins/behaviors/openlayers_behavior_dragpan.inc
index d7e4d20..5ce177a 100644
--- a/plugins/behaviors/openlayers_behavior_dragpan.inc
+++ b/plugins/behaviors/openlayers_behavior_dragpan.inc
@@ -36,7 +36,7 @@ class openlayers_behavior_dragpan extends openlayers_behavior {
     return array('OpenLayers.Control.DragPan');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     $form = array();
 
     // This options seem to be buggy.  Shoudl look into more.
diff --git a/plugins/behaviors/openlayers_behavior_drawfeatures.inc b/plugins/behaviors/openlayers_behavior_drawfeatures.inc
index ff065b8..a524bd4 100644
--- a/plugins/behaviors/openlayers_behavior_drawfeatures.inc
+++ b/plugins/behaviors/openlayers_behavior_drawfeatures.inc
@@ -33,7 +33,7 @@ class openlayers_behavior_drawfeatures extends openlayers_behavior {
     );
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     $features = array(
       'point' => t('Point'),
       'path' => t('Path'),
diff --git a/plugins/behaviors/openlayers_behavior_fullscreen.inc b/plugins/behaviors/openlayers_behavior_fullscreen.inc
index 448f7e3..f87c1e9 100644
--- a/plugins/behaviors/openlayers_behavior_fullscreen.inc
+++ b/plugins/behaviors/openlayers_behavior_fullscreen.inc
@@ -34,7 +34,7 @@ class openlayers_behavior_fullscreen extends openlayers_behavior {
   /**
    * Provide form for configurations per map.
    */
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'activated' => array(
         '#title' => t('Initially activated'),
diff --git a/plugins/behaviors/openlayers_behavior_geolocate.inc b/plugins/behaviors/openlayers_behavior_geolocate.inc
index 22942d5..04051ce 100644
--- a/plugins/behaviors/openlayers_behavior_geolocate.inc
+++ b/plugins/behaviors/openlayers_behavior_geolocate.inc
@@ -38,7 +38,7 @@ class openlayers_behavior_geolocate extends openlayers_behavior {
     );
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     $intials = $this->options_init();
 
     return array(
diff --git a/plugins/behaviors/openlayers_behavior_layerswitcher.inc b/plugins/behaviors/openlayers_behavior_layerswitcher.inc
index 70ed6dc..94db375 100644
--- a/plugins/behaviors/openlayers_behavior_layerswitcher.inc
+++ b/plugins/behaviors/openlayers_behavior_layerswitcher.inc
@@ -38,7 +38,7 @@ class openlayers_behavior_layerswitcher extends openlayers_behavior {
     return array('OpenLayers.Control.LayerSwitcher');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'ascending' => array(
         '#type' => 'checkbox',
diff --git a/plugins/behaviors/openlayers_behavior_mouseposition.inc b/plugins/behaviors/openlayers_behavior_mouseposition.inc
index 0f15da8..b438231 100644
--- a/plugins/behaviors/openlayers_behavior_mouseposition.inc
+++ b/plugins/behaviors/openlayers_behavior_mouseposition.inc
@@ -39,7 +39,7 @@ class openlayers_behavior_mouseposition extends openlayers_behavior {
     return array('OpenLayers.Control.MousePosition');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'prefix' => array(
         '#title' => t('Prefix'),
diff --git a/plugins/behaviors/openlayers_behavior_navigation.inc b/plugins/behaviors/openlayers_behavior_navigation.inc
index f9f0cf0..8a26044 100644
--- a/plugins/behaviors/openlayers_behavior_navigation.inc
+++ b/plugins/behaviors/openlayers_behavior_navigation.inc
@@ -38,7 +38,7 @@ class openlayers_behavior_navigation extends openlayers_behavior {
     return array('OpenLayers.Control.Navigation');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'zoomWheelEnabled' => array(
         '#type' => 'checkbox',
diff --git a/plugins/behaviors/openlayers_behavior_panzoom.inc b/plugins/behaviors/openlayers_behavior_panzoom.inc
index 9fd8f1f..60af0f4 100644
--- a/plugins/behaviors/openlayers_behavior_panzoom.inc
+++ b/plugins/behaviors/openlayers_behavior_panzoom.inc
@@ -31,7 +31,7 @@ class openlayers_behavior_panzoom extends openlayers_behavior {
     );
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
     );
   }
diff --git a/plugins/behaviors/openlayers_behavior_panzoombar.inc b/plugins/behaviors/openlayers_behavior_panzoombar.inc
index fd36d18..b41a9e7 100644
--- a/plugins/behaviors/openlayers_behavior_panzoombar.inc
+++ b/plugins/behaviors/openlayers_behavior_panzoombar.inc
@@ -36,7 +36,7 @@ class openlayers_behavior_panzoombar extends openlayers_behavior {
     return array('OpenLayers.Control.PanZoomBar');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'zoomWorldIcon' => array(
         '#type' => 'checkbox',
diff --git a/plugins/behaviors/openlayers_behavior_permalink.inc b/plugins/behaviors/openlayers_behavior_permalink.inc
index da4f854..5cc8697 100644
--- a/plugins/behaviors/openlayers_behavior_permalink.inc
+++ b/plugins/behaviors/openlayers_behavior_permalink.inc
@@ -35,7 +35,7 @@ class openlayers_behavior_permalink extends openlayers_behavior {
     return array('OpenLayers.Control.Permalink');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'anchor' => array(
         '#type' => 'checkbox',
diff --git a/plugins/behaviors/openlayers_behavior_popup.inc b/plugins/behaviors/openlayers_behavior_popup.inc
index 03547ed..981dfe0 100644
--- a/plugins/behaviors/openlayers_behavior_popup.inc
+++ b/plugins/behaviors/openlayers_behavior_popup.inc
@@ -34,7 +34,7 @@ class openlayers_behavior_popup extends openlayers_behavior {
   /**
    * Form defintion for per map customizations.
    */
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     // Only prompt for vector layers
     $vector_layers = array();
     foreach ($this->map['layers'] as $id => $name) {
diff --git a/plugins/behaviors/openlayers_behavior_scaleline.inc b/plugins/behaviors/openlayers_behavior_scaleline.inc
index 9b646fa..e250301 100644
--- a/plugins/behaviors/openlayers_behavior_scaleline.inc
+++ b/plugins/behaviors/openlayers_behavior_scaleline.inc
@@ -35,7 +35,7 @@ class openlayers_behavior_scaleline extends openlayers_behavior {
     return array('OpenLayers.Control.ScaleLine');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array();
   }
 
diff --git a/plugins/behaviors/openlayers_behavior_tooltip.inc b/plugins/behaviors/openlayers_behavior_tooltip.inc
index 6a56ebe..1560e2b 100644
--- a/plugins/behaviors/openlayers_behavior_tooltip.inc
+++ b/plugins/behaviors/openlayers_behavior_tooltip.inc
@@ -35,7 +35,7 @@ class openlayers_behavior_tooltip extends openlayers_behavior {
   /**
    * Form defintion for per map customizations.
    */
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     // Only prompt for vector layers
     $vector_layers = array();
     foreach ($this->map['layers'] as $id => $name) {
diff --git a/plugins/behaviors/openlayers_behavior_zoombox.inc b/plugins/behaviors/openlayers_behavior_zoombox.inc
index a7e0eb4..ba5d048 100644
--- a/plugins/behaviors/openlayers_behavior_zoombox.inc
+++ b/plugins/behaviors/openlayers_behavior_zoombox.inc
@@ -35,7 +35,7 @@ class openlayers_behavior_zoombox extends openlayers_behavior {
     return array('OpenLayers.Control.ZoomBox');
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array();
   }
 
diff --git a/plugins/behaviors/openlayers_behavior_zoomtolayer.inc b/plugins/behaviors/openlayers_behavior_zoomtolayer.inc
index e0e9e16..6d53e85 100644
--- a/plugins/behaviors/openlayers_behavior_zoomtolayer.inc
+++ b/plugins/behaviors/openlayers_behavior_zoomtolayer.inc
@@ -31,7 +31,7 @@ class openlayers_behavior_zoomtolayer extends openlayers_behavior {
     );
   }
 
-  function options_form($defaults) {
+  function options_form($defaults = array()) {
     return array(
       'zoomtolayer' => array(
         '#type' => 'select',
diff --git a/plugins/layer_types/openlayers_layer_type_cloudmade.inc b/plugins/layer_types/openlayers_layer_type_cloudmade.inc
index 0faa9cb..08f3098 100644
--- a/plugins/layer_types/openlayers_layer_type_cloudmade.inc
+++ b/plugins/layer_types/openlayers_layer_type_cloudmade.inc
@@ -49,7 +49,7 @@ class openlayers_layer_type_cloudmade extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     $warning = (!variable_get('openlayers_layers_cloudmade_js', FALSE) ||
       !variable_get('openlayers_layers_cloudmade_api', FALSE)) ?
         array(
diff --git a/plugins/layer_types/openlayers_layer_type_geojson.inc b/plugins/layer_types/openlayers_layer_type_geojson.inc
index 7ad7e8f..feecc98 100644
--- a/plugins/layer_types/openlayers_layer_type_geojson.inc
+++ b/plugins/layer_types/openlayers_layer_type_geojson.inc
@@ -49,7 +49,7 @@ class openlayers_layer_type_geojson extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_google.inc b/plugins/layer_types/openlayers_layer_type_google.inc
index 410fbb9..cbd2a44 100644
--- a/plugins/layer_types/openlayers_layer_type_google.inc
+++ b/plugins/layer_types/openlayers_layer_type_google.inc
@@ -48,7 +48,7 @@ class openlayers_layer_type_google extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     $google_layer_types = array(
       'hybrid' => 'Hybrid',
       'normal' => 'Normal',
diff --git a/plugins/layer_types/openlayers_layer_type_kml.inc b/plugins/layer_types/openlayers_layer_type_kml.inc
index baa46f2..256f830 100644
--- a/plugins/layer_types/openlayers_layer_type_kml.inc
+++ b/plugins/layer_types/openlayers_layer_type_kml.inc
@@ -52,7 +52,7 @@ class openlayers_layer_type_kml extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_maptiler.inc b/plugins/layer_types/openlayers_layer_type_maptiler.inc
index f494663..a02ca1a 100644
--- a/plugins/layer_types/openlayers_layer_type_maptiler.inc
+++ b/plugins/layer_types/openlayers_layer_type_maptiler.inc
@@ -51,7 +51,7 @@ class openlayers_layer_type_maptiler extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'base_url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_osm.inc b/plugins/layer_types/openlayers_layer_type_osm.inc
index a1b2a21..0b87f2a 100644
--- a/plugins/layer_types/openlayers_layer_type_osm.inc
+++ b/plugins/layer_types/openlayers_layer_type_osm.inc
@@ -50,7 +50,7 @@ class openlayers_layer_type_osm extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'base_url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_raw.inc b/plugins/layer_types/openlayers_layer_type_raw.inc
index 1b081eb..9051dc9 100644
--- a/plugins/layer_types/openlayers_layer_type_raw.inc
+++ b/plugins/layer_types/openlayers_layer_type_raw.inc
@@ -39,7 +39,7 @@ class openlayers_layer_type_raw extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       array(
         '#value' => t('Raw layers should not be added
diff --git a/plugins/layer_types/openlayers_layer_type_tms.inc b/plugins/layer_types/openlayers_layer_type_tms.inc
index f5e710e..c046247 100644
--- a/plugins/layer_types/openlayers_layer_type_tms.inc
+++ b/plugins/layer_types/openlayers_layer_type_tms.inc
@@ -51,7 +51,7 @@ class openlayers_layer_type_tms extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'base_url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_virtualearth.inc b/plugins/layer_types/openlayers_layer_type_virtualearth.inc
index 88c03c8..b7db0f1 100644
--- a/plugins/layer_types/openlayers_layer_type_virtualearth.inc
+++ b/plugins/layer_types/openlayers_layer_type_virtualearth.inc
@@ -45,7 +45,7 @@ class openlayers_layer_type_virtualearth extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'layer_type' => array(
         '#type' => 'hidden',
diff --git a/plugins/layer_types/openlayers_layer_type_wms.inc b/plugins/layer_types/openlayers_layer_type_wms.inc
index ea29bf7..fa0ac1f 100644
--- a/plugins/layer_types/openlayers_layer_type_wms.inc
+++ b/plugins/layer_types/openlayers_layer_type_wms.inc
@@ -53,7 +53,7 @@ class openlayers_layer_type_wms extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'base_url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_xyz.inc b/plugins/layer_types/openlayers_layer_type_xyz.inc
index eee3e77..ba237df 100644
--- a/plugins/layer_types/openlayers_layer_type_xyz.inc
+++ b/plugins/layer_types/openlayers_layer_type_xyz.inc
@@ -49,7 +49,7 @@ class openlayers_layer_type_xyz extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     return array(
       'base_url' => array(
         '#type' => 'textfield',
diff --git a/plugins/layer_types/openlayers_layer_type_yahoo.inc b/plugins/layer_types/openlayers_layer_type_yahoo.inc
index 583923f..45b6e77 100644
--- a/plugins/layer_types/openlayers_layer_type_yahoo.inc
+++ b/plugins/layer_types/openlayers_layer_type_yahoo.inc
@@ -44,7 +44,7 @@ class openlayers_layer_type_yahoo extends openlayers_layer_type {
   /**
    * Options form which generates layers
    */
-  function options_form() {
+  function options_form($defaults = array()) {
     $warning = (!variable_get('openlayers_layers_yahoo_api', FALSE)) ?
       array('#value' => t('WARNING: Your Yahoo API key is not set.
         Map including Yahoo layers will break until it is set correctly.')