diff --git a/src/interfaces/jdbc/postgresql/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
index e3ffc3450ef..3aef2068cd3 100644
--- a/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
@@ -2121,7 +2121,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 						     "ic.relname AS COLUMN_NAME," +
 						     "'1' as KEY_SEQ,"+ // -- fake it as a String for now
 						     "t.typname as PK_NAME " +
-						     " FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a " +
+						     " FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a, pg_type t " +
 						     " WHERE relkind = 'r' " + //    -- not indices
 						     "  and bc.relname ~ '"+table+"'" +
 						     "  and i.indrelid = bc.oid" +
diff --git a/src/interfaces/jdbc/postgresql/PreparedStatement.java b/src/interfaces/jdbc/postgresql/PreparedStatement.java
index 659375064d3..1f82314e115 100644
--- a/src/interfaces/jdbc/postgresql/PreparedStatement.java
+++ b/src/interfaces/jdbc/postgresql/PreparedStatement.java
@@ -470,14 +470,19 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
 			case Types.VARCHAR:
 			case Types.LONGVARCHAR:
 				setString(parameterIndex, x.toString());
+				break;
 			case Types.DATE:
 				setDate(parameterIndex, (java.sql.Date)x);
+				break;
 			case Types.TIME:
 				setTime(parameterIndex, (Time)x);
+				break;
 			case Types.TIMESTAMP:
 				setTimestamp(parameterIndex, (Timestamp)x);
+				break;
 			case Types.OTHER:
 				setString(parameterIndex, ((PGobject)x).getValue());
+				break;
 			default:
 				throw new SQLException("Unknown Types value");
 		}