diff --git a/.gitignore b/.gitignore
index cfebbffad7..5bc13dec5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ atlassian-ide-plugin.xml
 .project
 .settings
 .metadata
+*/bin
 
 # NetBeans specific files/directories
 .nbattrs
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java
index 9fdcd6e73f..63869498f0 100755
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java
@@ -221,4 +221,8 @@ public class DerbyDialect extends DB2Dialect {
 	public boolean supportsLobValueChangePropogation() {
 		return false;
 	}
+	
+	public boolean supportsUnboundedLobLocatorMaterialization() {
+		return false;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java b/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java
index f5d06fa3d8..c58af8a234 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java
@@ -73,7 +73,7 @@ public class TypeNames {
 	 * @return the default type name associated with specified key
 	 */
 	public String get(int typecode) throws MappingException {
-		String result = defaults.get( new Integer(typecode) );
+		String result = defaults.get( typecode );
 		if (result==null) throw new MappingException("No Dialect mapping for JDBC type: " + typecode);
 		return result;
 	}
@@ -88,7 +88,7 @@ public class TypeNames {
 	 * if available and the default type name otherwise
 	 */
 	public String get(int typecode, int size, int precision, int scale) throws MappingException {
-		Map<Integer, String> map = weighted.get( new Integer(typecode) );
+		Map<Integer, String> map = weighted.get( typecode );
 		if ( map!=null && map.size()>0 ) {
 			// iterate entries ordered by capacity to find first fit
 			for (Map.Entry<Integer, String> entry: map.entrySet()) {
@@ -111,10 +111,10 @@ public class TypeNames {
 	 * @param typecode the type key
 	 */
 	public void put(int typecode, int capacity, String value) {
-		Map<Integer, String> map = weighted.get( new Integer(typecode) );
+		Map<Integer, String> map = weighted.get( typecode );
 		if (map == null) {// add new ordered map
 			map = new TreeMap<Integer, String>();
-			weighted.put( new Integer(typecode), map );
+			weighted.put( typecode, map );
 		}
 		map.put(new Integer(capacity), value);
 	}
@@ -124,7 +124,7 @@ public class TypeNames {
 	 * @param typecode the type key
 	 */
 	public void put(int typecode, String value) {
-		defaults.put( new Integer(typecode), value );
+		defaults.put( typecode, value );
 	}
 }
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index bf2d8404e1..612ed153fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -1160,7 +1160,7 @@ public abstract class AbstractEntityPersister
 		return select.addCondition( rootTableKeyColumnNames, "=?" ).toStatementString();
 	}
 
-	protected boolean[] getPropertyUniqueness() {
+	public boolean[] getPropertyUniqueness() {
 		return propertyUniqueness;
 	}