diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index 4f19d48ce..a7f6be3b9 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -486,6 +486,7 @@ class MFDictModule extends MFModule
 			// Directories to scan
 			foreach(glob($sDir.'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $sSubDir)
 			{
+				/** @noinspection SlowArrayOperationsInLoopInspection */
 				$aDictionaries = array_merge($aDictionaries, $this->GetDictionaryFiles($sSubDir));
 			}
 		}
@@ -943,18 +944,15 @@ class ModelFactory
 					}
 				}
 			}
-			catch (Exception $e)
-			{
+			catch (Exception $e) {
 				throw new Exception('Failed to load dictionary file "'.$sPHPFile.'", reason: '.$e->getMessage());
 			}
 
 		}
-		catch (Exception $e)
-		{
+		catch (Exception $e) {
 			$aLoadedModuleNames = array();
-			foreach (self::$aLoadedModules as $oModule)
-			{
-				$aLoadedModuleNames[] = $oModule->GetName();
+			foreach (self::$aLoadedModules as $oLoadedModule) {
+				$aLoadedModuleNames[] = $oLoadedModule->GetName();
 			}
 			throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',',
 					$aLoadedModuleNames));
diff --git a/setup/parameters.class.inc.php b/setup/parameters.class.inc.php
index 0a585c03e..7d3d94904 100644
--- a/setup/parameters.class.inc.php
+++ b/setup/parameters.class.inc.php
@@ -126,14 +126,16 @@ class PHPParameters extends Parameters
 
 class XMLParameters extends Parameters
 {
+	/** @var array */
+	public $aData;
 	protected $sParametersFile;
-	
+
 	public function __construct($sParametersFile)
 	{
 		parent::__construct();
 		$this->LoadFromFile($sParametersFile);
 	}
-	
+
 	public function LoadFromFile($sParametersFile)
 	{
 		$this->sParametersFile = $sParametersFile;