diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 3d34abcef601e2993133bc9250fdc94f3d51fd44..ba1f9237d4a92336f21dd62b558c3793d8623532 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -471,7 +471,7 @@ private void initReviewStatuses(CaseDbConnection connection) throws SQLException
 			for (BlackboardArtifact.ReviewStatus status : BlackboardArtifact.ReviewStatus.values()) {
 				try {
 					statement.execute("INSERT INTO review_statuses (review_status_id, review_status_name, display_name) " //NON-NLS
-							+ "VALUES (" + status.getID() + ",\"" + status.getName() + "\",\"" + status.getDisplayName() + "\")"); //NON-NLS
+							+ "VALUES (" + status.getID() + ",'" + status.getName() + "','" + status.getDisplayName() + "')"); //NON-NLS
 				} catch (SQLException ex) {
 					resultSet = connection.executeQuery(statement, "SELECT COUNT(*) as count FROM review_statuses WHERE review_status_id = " + status.getID()); //NON-NLS
 					resultSet.next();
@@ -955,6 +955,15 @@ private int updateFromSchema4toSchema5(int schemaVersionNumber, CaseDbConnection
 	public int getSchemaVersion() {
 		return this.versionNumber;
 	}
+	
+	/**
+ 	 * Returns the type of database in use.
+ 	 * 
+ 	 * @return database type 
+ 	 */
+ 	public DbType getDatabaseType() {
+ 		return this.dbType;
+ 	}	
 
 	/**
 	 * Returns the path of a backup copy of the database made when a schema
diff --git a/tsk/auto/db_postgresql.cpp b/tsk/auto/db_postgresql.cpp
index 680bc17cc0b9bdd00063263c9bcbb9830c20f253..2cc6610200451d31c482aa13327f09e817184d17 100755
--- a/tsk/auto/db_postgresql.cpp
+++ b/tsk/auto/db_postgresql.cpp
@@ -558,8 +558,8 @@ int TskDbPostgreSQL::initialize() {
 		"artifact_type_id BIGINT NOT NULL, "
 		"review_status_id INTEGER NOT NULL, "
         "FOREIGN KEY(obj_id) REFERENCES tsk_objects(obj_id), "
-		"FOREIGN KEY(artifact_type_id) REFERENCES blackboard_artifact_types(artifact_type_id)), "
-		"FOREIGN KEY(review_status_id) REFERENCES review_statuses(review_status_id)",
+		"FOREIGN KEY(artifact_type_id) REFERENCES blackboard_artifact_types(artifact_type_id), "
+		"FOREIGN KEY(review_status_id) REFERENCES review_statuses(review_status_id))",
         "Error creating blackboard_artifact table: %s\n")
         ||
         attempt_exec("ALTER SEQUENCE blackboard_artifacts_artifact_id_seq minvalue -9223372036854775808 restart with -9223372036854775808", "Error setting starting value for artifact_id: %s\n")
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index 2132bbb0f6d146e94de568eb21f3915094d81339..d356f487d8b1a45966244c2723337341c8b256b1 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -68,7 +68,7 @@ class TskAutoDb:public TskAuto {
      * Sets whether or not the file systems for an image should be added when 
      * the image is added to the case database. The default value is true. 
      */
-    void TskAutoDb::setAddFileSystems(bool addFileSytems);
+    void setAddFileSystems(bool addFileSytems);
 
     /**
      * Skip processing of orphans on FAT filesystems.  
diff --git a/tsk/img/img_types.c b/tsk/img/img_types.c
index 9037c1eedbdc374fc0eca8878057ba18d0de96e2..9897299ddf1286cf6cb7619d8625ec2619d59c6e 100644
--- a/tsk/img/img_types.c
+++ b/tsk/img/img_types.c
@@ -20,7 +20,7 @@
   */
 typedef struct {
     char *name;
-    uint8_t code;
+    uint16_t code;
     char *comment;
 } IMG_TYPES;
 
@@ -39,6 +39,12 @@ static IMG_TYPES img_open_table[] = {
 #endif
 #if HAVE_LIBEWF
     {"ewf", TSK_IMG_TYPE_EWF_EWF, "Expert Witness Format (EnCase)"},
+#endif
+#if HAVE_LIBVMDK
+    {"vmdk", TSK_IMG_TYPE_VMDK_VMDK, "Virtual Machine Disk (VmWare, Virtual Box)"},
+#endif
+#if HAVE_LIBVHDI
+    {"vhd", TSK_IMG_TYPE_VHD_VHD, "Virtual Hard Drive (Microsoft)"},
 #endif
     {0},
 };