diff --git a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
index fc24422..62f73a3 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
@@ -10,6 +10,8 @@
  *    Eike Stepper - maintenance
  *    Stefan Winkler - Bug 276979
  *    Stefan Winkler - Bug 289445
+ *    Stefan Winker  - Bug 350137
+ *    Victor Roldan Betancort - Bug 323006
  */
 package org.eclipse.net4j.db.postgresql;
 
@@ -84,12 +86,18 @@
     case LONGVARCHAR:
     case VARCHAR:
     case CLOB:
-      return "text"; //$NON-NLS-1$
+      return "text"; //$NON-NLS-1$    
+    case BINARY:
+    case LONGVARBINARY:
     case VARBINARY:
     case BLOB:
       return "bytea"; //$NON-NLS-1$
     case DOUBLE:
       return "double precision"; //$NON-NLS-1$
+    case BIT:
+      return "boolean"; //$NON-NLS-1$
+    case TINYINT:
+      return "smallint"; //$NON-NLS-1
     }
 
     return super.getTypeName(field);
@@ -135,11 +143,11 @@
   {
     switch (type)
     {
-    // Due to Bug 289194: [DB] BLOB not correctly handled by PostgreSQL DBAdapter
-    case BLOB:
-      return DBType.VARBINARY;
+    case CHAR:
+      // Due to Bug 350137 (PostgreSQL does not like zeros in strings ...)
+      // SMALLINT won't fit since it only supports 32767 as maximum value, whereas Character.MAX_VALUE is 65535
+      return DBType.INTEGER;
     }
-
     return super.adaptType(type);
   }