diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php
index 9bb60b4461..79e9f68771 100644
--- a/libraries/normalization.lib.php
+++ b/libraries/normalization.lib.php
@@ -89,7 +89,7 @@ function PMA_getHtmlForCreateNewColumn(
             8, '', null, array(), null, null, null,
             $comments_map, null, true,
             array(), $cfgRelation,
-            $available_mime, $mime_map
+            isset($available_mime)?$available_mime:array(), $mime_map
         );
     }
     return PMA_getHtmlForTableFieldDefinitions($header_cells, $content_cells);
@@ -471,7 +471,7 @@ function PMA_createNewTablesFor2NF($partialDependencies, $tablesName, $table, $d
  * build the html for showing the new tables to have in order
  * to put given tables in 3NF
  *
- * @param array  $dependencies containing all the dependencies
+ * @param object $dependencies containing all the dependencies
  * @param array  $tables       tables formed after 2NF and need to convert to 3NF
  * @param string $db           current database
  *
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index dc588bf159..29113a3f68 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -138,7 +138,8 @@ function PMA_getHtmlForTableConfigurations()
 function PMA_getHtmlForFooter()
 {
     $html = '<fieldset class="tblFooters">'
-        . '<input type="button" class="preview_sql" value="' . __('Preview SQL') . '" />'
+        . '<input type="button" class="preview_sql" value="'
+        . __('Preview SQL') . '" />'
         . '<input type="submit" name="do_save_data" value="' . __('Save') . '" />'
         . '</fieldset>'
         . '<div id="properties_message"></div>'
@@ -566,11 +567,11 @@ function PMA_getColumnMetaForDefault($columnMeta, $isDefault)
 /**
  * Function to get html for the column name
  *
- * @param int   $columnNumber column number
- * @param int   $ci           cell index
- * @param int   $ci_offset    cell index offset
- * @param array $columnMeta   column meta
- * @param array $cfgRelation  configuration relation
+ * @param int        $columnNumber column number
+ * @param int        $ci           cell index
+ * @param int        $ci_offset    cell index offset
+ * @param array|null $columnMeta   column meta
+ * @param array      $cfgRelation  configuration relation
  *
  * @return string
  */
diff --git a/test/libraries/PMA_normalization_test.php b/test/libraries/PMA_normalization_test.php
index e4ba0e5f12..0ab21ae57c 100644
--- a/test/libraries/PMA_normalization_test.php
+++ b/test/libraries/PMA_normalization_test.php
@@ -337,7 +337,8 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
     {
         $tables= array("PMA_table"=>array('col1'));
         $db = 'PMA_db';
-        $dependencies = array('col1'=>array('col2'));
+        $dependencies = new stdClass();
+        $dependencies->col1 = array('col2');
         $result = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
         $this->assertEquals(
             array(
@@ -346,8 +347,6 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
                 ), $result
         );
         $tables= array("PMA_table"=>array('col1', 'PMA_table'));
-        $dependencies = new stdClass();
-        $dependencies->col1 = array('col2');
         $dependencies->PMA_table = array('col4', 'col5');
         $result1 = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
         $this->assertInternalType('array', $result1);