diff --git a/admin-dev/init.php b/admin-dev/init.php
index 3299a3390..a2a479631 100644
--- a/admin-dev/init.php
+++ b/admin-dev/init.php
@@ -28,6 +28,7 @@
 ob_start();
 $timerStart = microtime(true);
 
+$context = Context::getContext();
 if (isset($_GET['logout']))
 	$cookie->logout();
 
diff --git a/config/config.inc.php b/config/config.inc.php
index 8e78da10b..6ff9f4e19 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -97,7 +97,7 @@ Configuration::loadConfiguration();
 Language::loadLanguages();
 
 /* Loading default country */
-$defaultCountry = new Country((int)(Configuration::get('PS_COUNTRY_DEFAULT')), Configuration::get('PS_LANG_DEFAULT'));
+$defaultCountry = new Country(Configuration::get('PS_COUNTRY_DEFAULT'), Configuration::get('PS_LANG_DEFAULT'));
 
 /* Instantiate cookie */
 if (defined('PS_ADMIN_DIR'))
diff --git a/controllers/OrderDetailController.php b/controllers/OrderDetailController.php
index 8c06088f1..b4e0c9ade 100644
--- a/controllers/OrderDetailController.php
+++ b/controllers/OrderDetailController.php
@@ -42,7 +42,6 @@ class OrderDetailControllerCore extends FrontController
 	public function preProcess()
 	{
 		parent::preProcess();
-		
 
 		if (Tools::isSubmit('submitMessage'))
 		{
@@ -74,7 +73,7 @@ class OrderDetailControllerCore extends FrontController
 						$to = strval($to->email);
 					}
 					$toName = strval(Configuration::get('PS_SHOP_NAME'));
-					$customer = $context->customer->id;
+					$customer = $this->context->customer->id;
 					if (Validate::isLoadedObject($customer))
 						Mail::Send($this->context->language->id, 'order_customer_comment', Mail::l('Message from a customer'),
 						array(
diff --git a/controllers/ProductController.php b/controllers/ProductController.php
index 5a1caafca..7e6770330 100644
--- a/controllers/ProductController.php
+++ b/controllers/ProductController.php
@@ -209,7 +209,7 @@ class ProductControllerCore extends FrontController
 					'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2),
 					'ecotaxTax_rate' => $ecotax_rate,
 					'homeSize' => Image::getSize('home'),
-					'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $context->language->id),
+					'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $this->context->language->id),
 					'token' => Tools::getToken(false),
 					'productPriceWithoutEcoTax' => (float)$productPriceWithoutEcoTax,
 					'features' => $features,