Index: branches/5.3.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r15807 -r15909
--- branches/5.3.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15807)
+++ branches/5.3.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15909)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 15807 2013-06-25 14:18:34Z alex $
+* @version	$Id: products_event_handler.php 15909 2013-07-23 13:48:24Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1511,10 +1511,10 @@
 			$event->MasterEvent->getUnitConfig()->addClones(Array (
 				$sub_item_prefix => Array (
 					'ConfigMapping' => Array (
-				'PerPage'				=>	'Comm_Perpage_Reviews',
+						'PerPage'				=>	'Comm_Perpage_Reviews',
 
-				'ReviewDelayInterval'	=>	'product_ReviewDelay_Value',
-				'ReviewDelayValue'		=>	'product_ReviewDelay_Interval',
+						'ReviewDelayInterval'	=>	'product_ReviewDelay_Value',
+						'ReviewDelayValue'		=>	'product_ReviewDelay_Interval',
 					),
 				),
 			));
Index: branches/5.3.x/units/addresses/addresses_event_handler.php
===================================================================
diff -u -N -r15695 -r15909
--- branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15695)
+++ branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15909)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_event_handler.php 15695 2013-02-19 11:30:36Z alex $
+* @version	$Id: addresses_event_handler.php 15909 2013-07-23 13:48:24Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -419,7 +419,7 @@
 			$site_helper = $this->Application->recallObject('SiteHelper');
 			/* @var $site_helper SiteHelper */
 
-			$config = $this->Application->getUnitConfig($event->Prefix);
+			$config = $event->getUnitConfig();
 
 			$fields = $config->getFields();
 			$fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping');