diff --git a/properties.admin.inc b/properties.admin.inc
index 0ecefb2..50f2424 100644
--- a/properties.admin.inc
+++ b/properties.admin.inc
@@ -168,7 +168,7 @@ function properties_admin_attributes_form($form, &$form_state, $attribute = NULL
   $form['name'] = array(
     '#type' => 'machine_name',
     '#default_value' => $attribute->name,
-    '#maxlength' => 32,
+    '#maxlength' => 128,
     '#disabled' => !empty($attribute->name),
     '#machine_name' => array(
       'exists' => 'properties_attribute_load',
@@ -275,7 +275,7 @@ function properties_admin_categories_form($form, &$form_state, $category = NULL)
   $form['name'] = array(
     '#type' => 'machine_name',
     '#default_value' => $form_state['category']->name,
-    '#maxlength' => 32,
+    '#maxlength' => 128,
     '#disabled' => empty($form_state['category']->new),
     '#machine_name' => array(
       'exists' => 'properties_category_load',
diff --git a/properties_sql/properties_sql.install b/properties_sql/properties_sql.install
index ab04596..26424ac 100644
--- a/properties_sql/properties_sql.install
+++ b/properties_sql/properties_sql.install
@@ -18,7 +18,7 @@ function properties_sql_schema() {
       'name' => array(
         'description'   => 'machine_name of the category',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
@@ -41,7 +41,7 @@ function properties_sql_schema() {
       'name' => array(
         'description'   => 'machine_name of the attribute',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
@@ -65,14 +65,14 @@ function properties_sql_schema() {
       'category_name' => array(
         'description'   => 'refers to category',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
       'attribute_name' => array(
         'description'   => 'refers to attribute',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
@@ -92,8 +92,7 @@ function properties_sql_schema() {
         'columns' => array('name' => 'attribute_name')
         ),
       ),
-    // MARIA Storage engine key length must not be longer than 1024 bytes.
-    'primary key'     => array(array('category_name', 100), array('attribute_name', 100)),
+    'primary key'     => array('category_name', 'attribute_name'),
   );
 
 
@@ -104,7 +103,7 @@ function properties_sql_schema() {
       'name' => array(
         'description'   => 'machine_name of the template',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
@@ -127,14 +126,14 @@ function properties_sql_schema() {
       'template_name' => array(
         'description'   => 'refers to template',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'not null' => TRUE,
         'default' => ''
       ),
       'category_name' => array(
         'description'   => 'refers to category',
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 128,
         'default' => ''
       ),
       'weight' => array(
@@ -153,8 +152,7 @@ function properties_sql_schema() {
         'columns' => array('name' => 'category_name')
         ),
       ),
-    // MARIA Storage engine key length must not be longer than 1024 bytes.
-    'primary key'     => array(array('template_name', 100), array('category_name', 100)),
+    'primary key'     => array('template_name', 'category_name'),
   );
 
   return $schema;
@@ -185,4 +183,4 @@ function properties_sql_update_7000() {
 
     db_add_field('properties_template_category', 'weight', $schema);
   }
-}
\ No newline at end of file
+}
diff --git a/properties_template/properties_template.admin.inc b/properties_template/properties_template.admin.inc
index bcf9998..d6b6dfd 100644
--- a/properties_template/properties_template.admin.inc
+++ b/properties_template/properties_template.admin.inc
@@ -117,7 +117,7 @@ function properties_template_admin_templates_form($form, &$form_state, $template
   $form['name'] = array(
     '#type' => 'machine_name',
     '#default_value' => $form_state['template']->name,
-    '#maxlength' => 32,
+    '#maxlength' => 128,
     '#disabled' => empty($form_state['template']->new),
     '#machine_name' => array(
       'exists' => 'properties_template_load',