diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index ac36f4bbe..e3df9d46a 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -25,17 +25,16 @@
 *}
 
 <script type="text/javascript">
-	{if $product->is_virtual}
-		$('#virtual_good_attributes').show();
-	{else}
-		$('#virtual_good_attributes').hide();
-	{/if}
-
-	var msg_combination_1 = '{l s='Please choose an attribute'}';
-	var msg_combination_2 = '{l s='Please choose a value'}';
-	var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
-	var msg_new_combination = '{l s='New combination'}';
+	$(document).ready(function(){
+		{if $product->is_virtual}
+			$('#virtual_good_attributes').show();
+		{/if}
 
+		var msg_combination_1 = '{l s='Please choose an attribute'}';
+		var msg_combination_2 = '{l s='Please choose a value'}';
+		var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
+		var msg_new_combination = '{l s='New combination'}';
+	});
 </script>
 
 {if isset($product->id)}
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index a692e1aea..042d8e9f7 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -221,7 +221,7 @@
 							<label for="virtual_product_name" class="t">{l s='Filename'}</label>
 						</td>
 						<td class="col-right">
-							<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|htmlentities}" />
+							<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'htmlall':'UTF-8'}" />
 							<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
 						</td>
 					</tr>
diff --git a/cache/class_index.php b/cache/class_index.php
index 8886a8c19..0d9e14f59 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -478,7 +478,7 @@
   'OrderSlipCore' => 'classes/order/OrderSlip.php',
   'OrderState' => 'override/classes/order/OrderState.php',
   'OrderStateCore' => 'classes/order/OrderState.php',
-  'PDF' => 'override/classes/PDF.php',
+  'PDF' => 'override/classes/pdf/PDF.php',
   'PDFCore' => 'classes/pdf/PDF.php',
   'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php',
   'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php',
@@ -560,7 +560,7 @@
   'StateCore' => 'classes/State.php',
   'StatisticsController' => 'override/controllers/front/StatisticsController.php',
   'StatisticsControllerCore' => 'controllers/front/StatisticsController.php',
-  'Stock' => 'override/classes/Stock.php',
+  'Stock' => 'override/classes/stock/Stock.php',
   'StockAvailable' => 'override/classes/stock/StockAvailable.php',
   'StockAvailableCore' => 'classes/stock/StockAvailable.php',
   'StockCore' => 'classes/stock/Stock.php',
@@ -571,9 +571,9 @@
   'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
   'StockManagerModule' => 'override/classes/stock/StockManagerModule.php',
   'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php',
-  'StockMvt' => 'override/classes/StockMvt.php',
+  'StockMvt' => 'override/classes/stock/StockMvt.php',
   'StockMvtCore' => 'classes/stock/StockMvt.php',
-  'StockMvtReason' => 'override/classes/StockMvtReason.php',
+  'StockMvtReason' => 'override/classes/stock/StockMvtReason.php',
   'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php',
   'StockMvtWS' => 'override/classes/stock/StockMvtWS.php',
   'StockMvtWSCore' => 'classes/stock/StockMvtWS.php',
diff --git a/classes/Tools.php b/classes/Tools.php
index 0a3eff235..b721973d6 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -615,6 +615,7 @@ class ToolsCore
 	public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)
 	{
 		if (is_array($string))
+
 			return array_map(array('Tools', 'htmlentitiesUTF8'), $string);
 		return htmlentities($string, $type, 'utf-8');
 	}