diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
index 9bc9258e9a..9e81729d00 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
@@ -43,7 +43,7 @@ public interface CallMetaDataProvider {
 	 * Initialize the database specific management of procedure column meta data.
 	 * This is only called for databases that are supported. This initalization
 	 * can be turned off by specifying that column meta data should not be used.
-	 * @param databaseMetaData used to retreive database specific information
+	 * @param databaseMetaData used to retrieve database specific information
 	 * @param catalogName name of catalog to use or null
 	 * @param schemaName name of schema name to use or null
 	 * @param procedureName name of the stored procedure
@@ -127,13 +127,13 @@ public interface CallMetaDataProvider {
 	String getUserName();
 
 	/**
-	 * Does this database support returning resultsets that should be retreived with the JDBC call
+	 * Does this database support returning resultsets that should be retrieved with the JDBC call
 	 * {@link java.sql.Statement#getResultSet()}
 	 */
 	boolean isReturnResultSetSupported();
 
 	/**
-	 * Does this database support returning resultsets as ref cursors to be retreived with
+	 * Does this database support returning resultsets as ref cursors to be retrieved with
 	 * {@link java.sql.CallableStatement#getObject(int)} for the specified column.
 	 */
 	boolean isRefCursorSupported();
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
index 06dc0dc7a2..4e067a908a 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
@@ -63,8 +63,9 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 	/** indicates whether the use of a String[] for generated keys is supported */
 	private boolean generatedKeysColumnNameArraySupported = true;
 
-	/** database product we know that don't support the use of a String[] for generated keys */
-	private List productsNotSupportingGeneratedKeysColumnNameArray = Arrays.asList(new String[] {"Apache Derby"});
+	/** database products we know not supporting the use of a String[] for generated keys */
+	private List productsNotSupportingGeneratedKeysColumnNameArray =
+			Arrays.asList(new String[] {"Apache Derby", "HSQL Database Engine"});
 
 	/** Collection of TableParameterMetaData objects */
 	private List<TableParameterMetaData> insertParameterMetaData = new ArrayList<TableParameterMetaData>();
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
index af2f31e59f..1edc0feed1 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
@@ -39,7 +39,7 @@ public interface TableMetaDataProvider {
 	/**
 	 * Initialize using provided database metadata, table and column information. This initalization can be
 	 * turned off by specifying that column meta data should not be used.
-	 * @param databaseMetaData used to retreive database specific information
+	 * @param databaseMetaData used to retrieve database specific information
 	 * @param catalogName name of catalog to use or null
 	 * @param schemaName name of schema name to use or null
 	 * @param tableName name of the table
@@ -104,14 +104,14 @@ public interface TableMetaDataProvider {
  	boolean isGetGeneratedKeysSupported();
 
 	/**
-	 * Does this database support a simple quey to retreive the generated key whe the JDBC 3.0 feature
+	 * Does this database support a simple quey to retrieve the generated key whe the JDBC 3.0 feature
 	 * of retreiving generated keys is not supported
 	 * {@link java.sql.DatabaseMetaData#supportsGetGeneratedKeys()}
 	 */
  	boolean isGetGeneratedKeysSimulated();
 
 	/**
-	 * Get the simple query to retreive a generated key
+	 * Get the simple query to retrieve a generated key
 	 */
 	String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName);