diff --git a/openlayers.install b/openlayers.install
index fecff3d..b894c08 100644
--- a/openlayers.install
+++ b/openlayers.install
@@ -120,9 +120,6 @@ function openlayers_schema() {
       ),
     ),
     'primary key' => array('name'),
-    'indexes' => array(
-      'name' => array('name'),
-    ),
   );
   // Styles table (ctools extras)
   $schema['openlayers_styles'] = array(
@@ -168,9 +165,6 @@ function openlayers_schema() {
       ),
     ),
     'primary key' => array('name'),
-    'indexes' => array(
-      'name' => array('name'),
-    ),
   );
   return $schema;
 }
@@ -297,3 +291,11 @@ function openlayers_update_7201() {
   variable_set('openlayers_default_map', variable_get('openlayers_default_preset', 'default'));
   variable_del('openlayers_default_preset');
 }
+
+/**
+ * Drop name indexes duplicates of primary key.
+ */
+function openlayers_update_7202() {
+  db_drop_index('openlayers_layers', 'name');
+  db_drop_index('openlayers_styles', 'name');
+}
diff --git a/plugins/layer_types/openlayers_layer_type_wms.inc b/plugins/layer_types/openlayers_layer_type_wms.inc
index fa0ac1f..8086888 100644
--- a/plugins/layer_types/openlayers_layer_type_wms.inc
+++ b/plugins/layer_types/openlayers_layer_type_wms.inc
@@ -58,6 +58,7 @@ class openlayers_layer_type_wms extends openlayers_layer_type {
       'base_url' => array(
         '#type' => 'textfield',
         '#title' => t('Base URL'),
+        '#maxlength' => 2083,
         '#default_value' => isset($this->data['base_url']) ?
           $this->data['base_url'] : ''
       ),