Index: core/units/images/images.php
===================================================================
--- core/units/images/images.php
+++ core/units/images/images.php
@@ -23,7 +23,7 @@
 	 * @return bool
 	 * @access public
 	 */
-	public function Delete($id)
+	public function Delete($id = null)
 	{
 		$this->Load($id);
 		$local_path = FULL_PATH . $this->GetDBField('LocalPath');
@@ -36,7 +36,7 @@
 		if ( file_exists($thumb_path) ) {
 			unlink($thumb_path);
 		}
-		
+
 		return parent::Delete($id);
 	}
-}
\ No newline at end of file
+}
Index: core/units/pdf/pdf_text.php
===================================================================
--- core/units/pdf/pdf_text.php
+++ core/units/pdf/pdf_text.php
@@ -230,7 +230,7 @@
 		}
 	}
 
-	function DrawAt($page, $x, $y, $spacer_w=0)
+	function DrawAt($page, $x=0, $y=0, $spacer_w=0)
 	{
 		$page->SetLineWidth(0.1);
 
@@ -258,4 +258,4 @@
 		$this->CurX = $x;
 	}
 
-}
\ No newline at end of file
+}
Index: modules/in-commerce/units/product_option_combinations/product_option_formatters.php
===================================================================
--- modules/in-commerce/units/product_option_combinations/product_option_formatters.php
+++ modules/in-commerce/units/product_option_combinations/product_option_formatters.php
@@ -24,7 +24,7 @@
 		 * @param string $format
 		 * @return string
 		 */
-		function Format($value, $field_name, $object, $format=null)
+		function Format($value, $field_name, &$object, $format=null)
 		{
 			$o = '';
 			$options = $object->GetFieldOptions($field_name);
@@ -86,7 +86,7 @@
 		 * @param string $format
 		 * @return string
 		 */
-		function Format($value, $field_name, $object, $format=null)
+		function Format($value, $field_name, &$object, $format=null)
 		{
 			$options = $object->GetFieldOptions($field_name);
 			$converted = array_key_exists('converted', $options) ? $options['converted'] : false;
@@ -140,4 +140,4 @@
 			}
 			return $price;
 		}
-	}
\ No newline at end of file
+	}