diff --git a/install-dev/upgrade/php/update_genders_images.php b/install-dev/upgrade/php/update_genders_images.php
index 5039400a3..20b060356 100644
--- a/install-dev/upgrade/php/update_genders_images.php
+++ b/install-dev/upgrade/php/update_genders_images.php
@@ -26,12 +26,12 @@
 
 function update_genders_images()
 {
-	if (file_exists(_PS_IMG_DIR_.'genders/Mr.jpg'))
-		@rename(_PS_IMG_DIR_.'genders/Mr.jpg', _PS_IMG_DIR_.'genders/1.jpg');
-	if (file_exists(_PS_IMG_DIR_.'genders/Ms.jpg'))
-		@rename(_PS_IMG_DIR_.'genders/Ms.jpg', _PS_IMG_DIR_.'genders/2.jpg');
-	if (file_exists(_PS_IMG_DIR_.'genders/Miss.jpg'))
-		@rename(_PS_IMG_DIR_.'genders/Miss.jpg', _PS_IMG_DIR_.'genders/3.jpg');
-	if (file_exists(_PS_IMG_DIR_.'genders/unknown.jpg'))
-		@rename(_PS_IMG_DIR_.'unknown.jpg', _PS_IMG_DIR_.'Unknown.jpg');	
+	if (file_exists(_PS_ROOT_DIR_.'/img/genders/Mr.jpg'))
+		@rename(_PS_ROOT_DIR_.'/img/genders/Mr.jpg', _PS_ROOT_DIR_.'/img/genders/1.jpg');
+	if (file_exists(_PS_ROOT_DIR_.'/img/genders/Ms.jpg'))
+		@rename(_PS_ROOT_DIR_.'/img/genders/Ms.jpg', _PS_ROOT_DIR_.'/img/genders/2.jpg');
+	if (file_exists(_PS_ROOT_DIR_.'/img/genders/Miss.jpg'))
+		@rename(_PS_ROOT_DIR_.'/img/genders/Miss.jpg', _PS_ROOT_DIR_.'/img/genders/3.jpg');
+	if (file_exists(_PS_ROOT_DIR_.'genders/unknown.jpg'))
+		@rename(_PS_ROOT_DIR_.'/img/genders/unknown.jpg', _PS_ROOT_DIR_.'/img/genders/Unknown.jpg');	
 }
\ No newline at end of file
diff --git a/install-dev/upgrade/sql/1.5.1.0.sql b/install-dev/upgrade/sql/1.5.1.0.sql
index 70783b716..b365cf584 100644
--- a/install-dev/upgrade/sql/1.5.1.0.sql
+++ b/install-dev/upgrade/sql/1.5.1.0.sql
@@ -16,5 +16,5 @@ ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT N
 ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
-ALTER TABLE `PREFIX_stock_available` ADD UNIQUE (`id_product`, `id_product_attribute`, `id_shop`);
+ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`);
 ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`);
diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 79b1d1474..bdc915c3d 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -86,7 +86,7 @@ $(function(){ldelim}
 
 <p class="required"><sup>*</sup> {l s='Required field'}</p>
 
-<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_adress">
+<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_address">
 	<fieldset>
 		<h3>{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3>
 		<p class="required text dni">
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 84d6bc9ca..dbc526971 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -1415,13 +1415,13 @@ a.iframe {font-weight:bold}
 #address #left_column {display:none}
 #address #center_column{width:757px}
 
-form#add_adress {}
-#add_adress fieldset {
+form#add_address {}
+#add_address fieldset {
 	margin:0;
 	border:1px solid #ccc;
 	background:#F8F8F8
 }
-#add_adress h3 {
+#add_address h3 {
 	margin:0 0 15px 0;
 	padding:8px;
 	font-size:14px;
@@ -1429,24 +1429,24 @@ form#add_adress {}
 	text-transform:uppercase;
 	background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898
 }
-#center_column #add_adress p {margin:0; padding:0 0 10px 0}
-#add_adress p.required {color:#222}
-#add_adress p.required  sup {color:#990000}
+#center_column #add_address p {margin:0; padding:0 0 10px 0}
+#add_address p.required {color:#222}
+#add_address p.required  sup {color:#990000}
 
-#add_adress p.text label,
-#add_adress p.password label,
-#add_adress p.select label,
-#add_adress p.select span,
-#add_adress p.textarea label {
+#add_address p.text label,
+#add_address p.password label,
+#add_address p.select label,
+#add_address p.select span,
+#add_address p.textarea label {
 	display:inline-block;
 	padding:6px 15px;
 	width:230px;/* 260 */
 	font-size:14px;
 	text-align:right
 }
-#add_adress p.text input,
-#add_adress p.password input,
-#add_adress p.select input {
+#add_address p.text input,
+#add_address p.password input,
+#add_address p.select input {
 	padding:0 5px;
 	height:22px;
 	width:360px;/* 370 */
@@ -1455,30 +1455,30 @@ form#add_adress {}
 	color:#666;
 	line-height:22px
 }
-#add_adress p.checkbox input {
+#add_address p.checkbox input {
 	margin-left:260px;
 }
-#add_adress p.select select {
+#add_address p.select select {
 	margin-right:10px;
 	border:1px solid #ccc;
 	font-size: 12px;
 	color:#666
 }
-#add_adress p.textarea label {vertical-align:top}
-#add_adress p.textarea textarea {
+#add_address p.textarea label {vertical-align:top}
+#add_address p.textarea textarea {
 	height:80px;
 	width:370px;
 	border:1px solid #ccc;
 	font-size: 12px;
 	color:#666
 }
-#center_column  #add_adress p.submit2 {
+#center_column  #add_address p.submit2 {
 	margin-top:20px;
 	text-align:right
 }
 
-#add_adress span.form_info,
-#add_adress span.inline-infos {
+#add_address span.form_info,
+#add_address span.inline-infos {
 	display:block;
 	margin:5px 0 0 265px;
 	color:#666
diff --git a/themes/default/mobile/address.tpl b/themes/default/mobile/address.tpl
index 77efc340e..25fdb9e5d 100644
--- a/themes/default/mobile/address.tpl
+++ b/themes/default/mobile/address.tpl
@@ -84,7 +84,7 @@ $(document).ready(function() {
 		{/if}
 		</p>
 		
-		<form action="{$link->getPageLink('address', true)}" method="post" id="add_adress">
+		<form action="{$link->getPageLink('address', true)}" method="post" id="add_address" data-ajax="false">
 			<legend><h3>{if isset($id_address) && $id_address != 0}{l s='Your address'}{else}{l s='New address'}{/if}</h3></legend>
 			<div class="required text dni">
 				<label for="dni">{l s='Identification number'}</label>