diff --git a/libraries/fof/controller/controller.php b/libraries/fof/controller/controller.php
index d972f077d52ef..76b3416969c3a 100644
--- a/libraries/fof/controller/controller.php
+++ b/libraries/fof/controller/controller.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package    FrameworkOnFramework
- * @subpackage controller
+ * @package     FrameworkOnFramework
+ * @subpackage  controller
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 
 // Protect from unauthorized access
@@ -2153,7 +2154,7 @@ protected function setaccess($level = 0)
 	 *
 	 * @return  boolean  Returns true on success
 	 */
-	final private function applySave()
+	private function applySave()
 	{
 		// Load the model
 		$model = $this->getThisModel();
diff --git a/libraries/fof/database/iterator.php b/libraries/fof/database/iterator.php
index c05d8a6f789ba..96034b8434d9e 100644
--- a/libraries/fof/database/iterator.php
+++ b/libraries/fof/database/iterator.php
@@ -4,6 +4,7 @@
  * @subpackage  database
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  *
  * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
  * instead of plain stdClass objects
@@ -86,7 +87,7 @@ abstract class FOFDatabaseIterator implements Iterator
 	 *
 	 * @throws  InvalidArgumentException
 	 */
-	public static function &getIterator($dbName, $cursor, $column = null, $class, $config = array())
+	public static function &getIterator($dbName, $cursor, $column, $class, $config = array())
 	{
 		$className = 'FOFDatabaseIterator' . ucfirst($dbName);
 
@@ -105,7 +106,7 @@ public static function &getIterator($dbName, $cursor, $column = null, $class, $c
 	 *
 	 * @throws  InvalidArgumentException
 	 */
-	public function __construct($cursor, $column = null, $class, $config = array())
+	public function __construct($cursor, $column, $class, $config = array())
 	{
 		// Figure out the type and prefix of the class by the class name
 		$parts = FOFInflector::explode($class);
diff --git a/libraries/fof/layout/helper.php b/libraries/fof/layout/helper.php
index 16bf9353a4713..644c8bc22abd8 100644
--- a/libraries/fof/layout/helper.php
+++ b/libraries/fof/layout/helper.php
@@ -4,6 +4,7 @@
  * @subpackage  layout
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 // Protect from unauthorized access
 defined('FOF_INCLUDED') or die;
@@ -22,16 +23,17 @@ class FOFLayoutHelper extends JLayoutHelper
 	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
 	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
 	 * @param   string  $basePath     Base path to use when loading layout files
+	 * @param   mixed   $options      Optional custom options to load. Registry or array format
 	 *
 	 * @return  string
 	 */
-	public static function render($layoutFile, $displayData = null, $basePath = '')
+	public static function render($layoutFile, $displayData = null, $basePath = '', $options = null)
 	{
 		$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
 
 		// Make sure we send null to FOFLayoutFile if no path set
 		$basePath = empty($basePath) ? null : $basePath;
-		$layout = new FOFLayoutFile($layoutFile, $basePath);
+		$layout = new FOFLayoutFile($layoutFile, $basePath, $options);
 		$renderedLayout = $layout->render($displayData);
 
 		return $renderedLayout;
diff --git a/libraries/fof/table/relations.php b/libraries/fof/table/relations.php
index a431bf7598ef5..c98f935f9a92d 100644
--- a/libraries/fof/table/relations.php
+++ b/libraries/fof/table/relations.php
@@ -4,6 +4,7 @@
  * @subpackage  table
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 
 // Protect from unauthorized access
@@ -898,7 +899,7 @@ protected function addBespokePivotRelation($relationType, $itemName, $tableClass
 	 *
 	 * @return  void
 	 */
-	protected function normaliseParameters($pivot = false, &$itemName, &$tableClass, &$localKey, &$remoteKey, &$ourPivotKey, &$theirPivotKey, &$pivotTable)
+	protected function normaliseParameters($pivot, &$itemName, &$tableClass, &$localKey, &$remoteKey, &$ourPivotKey, &$theirPivotKey, &$pivotTable)
 	{
 		// Get a default table class if none is provided
 		if (empty($tableClass))