diff --git a/ChangeLog b/ChangeLog
index 473c85350..93bf6815d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-06-02 Loïc Chapeaux  <lolo@phpheaven.net>
+    * libraries/display_tbl.inc.php3, line 1413: xhtml fix.
+    * libraries/fpdf/fpdf.php3: light optimizations and fixes.
+
 2002-06-01 Loïc Chapeaux  <lolo@phpheaven.net>
     * db_details_structure.php3, lines 440-441; Documentation.html;
       pdf_schema.php3; libraries/fpdf/*:
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 650528ebc..6ff292644 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1410,7 +1410,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
         echo '<!-- Results table -->' . "\n"
            . '<table ';
         if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') {
-            echo 'border="1"; cellpadding="2" cellspacing="0"';
+            echo 'border="1" cellpadding="2" cellspacing="0"';
         } else {
             echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="5"';
         }
diff --git a/libraries/fpdf/fpdf.php3 b/libraries/fpdf/fpdf.php3
index f722ee684..49c0b5504 100644
--- a/libraries/fpdf/fpdf.php3
+++ b/libraries/fpdf/fpdf.php3
@@ -4,7 +4,7 @@
 /****************************************************************************
 * Software : FPDF                                                           *
 * Version :  1.5                                                            *
-* Date :     28/03/2002                                                     *
+* Date :     2002/05/28                                                     *
 * Author :   Olivier PLATHEY                                                *
 * Website :  http://www.fpdf.org                                            *
 * Licence :  Freeware                                                       *
@@ -13,7 +13,9 @@
 ****************************************************************************/
 
 
-define('FPDF_VERSION', '1.5');
+// loic1: PHP3 compatibility
+// define('FPDF_VERSION', '1.5');
+$FPDF_version = (string) '1.5';
 
 
 /**
@@ -450,7 +452,9 @@ class FPDF
 
         // Info
         $this->_newobj();
-        $this->_out('<</Producer (FPDF ' . FPDF_VERSION . ')');
+        // loic1: PHP3 compatibility
+        // $this->_out('<</Producer (FPDF ' . FPDF_VERSION . ')');
+        $this->_out('<</Producer (FPDF ' . $GLOBALS['FPDF_version'] . ')');
         if (!empty($this->title)) {
             $this->_out('/Title (' . $this->_escape($this->title) . ')');
         }
@@ -1154,9 +1158,10 @@ class FPDF
         if ($family == 'arial') {
             $family = 'helvetica';
         }
-        $style      = strtoupper($style);
         if ($family == 'symbol' || $family == 'zapfdingbats') {
             $style  = '';
+        } else {
+            $style  = strtoupper($style);
         }
         if (strpos(' ' . $style, 'U')) {
             $this->underline = TRUE;