diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 25cce23fd..f4089b0cb 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -943,7 +943,7 @@ class ShopCore extends ObjectModel
 	public static function addSqlRestrictionOnLang($alias = null, $id_shop = null)
 	{
 		if (is_null($id_shop))
-			$id_shop = Context::getContext()->shop->id;
+			$id_shop = Shop::getContextShopID();
 		return ' AND '.(($alias) ? $alias.'.' : '').'id_shop = '.$id_shop.' ';
 	}
 
diff --git a/modules/loyalty/loyalty.php b/modules/loyalty/loyalty.php
index 56ecbb33e..1c276252b 100644
--- a/modules/loyalty/loyalty.php
+++ b/modules/loyalty/loyalty.php
@@ -82,7 +82,7 @@ class Loyalty extends Module
 		Configuration::updateValue('PS_LOYALTY_VOUCHER_DETAILS', $conf);
 
 		$category_config = '';
-		$categories = Category::getSimpleCategories((int)(Configuration::get('PS_LANG_DEFAULT')));
+		$categories = Category::getSimpleCategories((int)Configuration::get('PS_LANG_DEFAULT'));
 		foreach ($categories as $category)
 			$category_config .= (int)$category['id_category'].',';
 		$category_config = rtrim($category_config, ',');