diff --git a/bindings/java/build.xml b/bindings/java/build.xml
old mode 100644
new mode 100755
index 8edc6d259a809f0ca8a1185d0e265e6baeb9d3d6..9c9a0a11aae52036e6ef73df0c60ed264334612d
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -99,7 +99,7 @@
 		</javac>
 	</target>
 
-	<target name="dist" depends="jni,init-ivy"
+	<target name="dist" depends="init-ivy, compile"
         description="generate the distribution" >
     <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
 		<jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/>
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
old mode 100644
new mode 100755
index 24779fbf9c6b1adaa543bd9d16cd410aa0b6a677..400d12200ee4217e4f479eb58f118f0289ecb637
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -15,8 +15,8 @@
 #include <locale.h>
 #include <time.h>
 
-TSK_HDB_INFO * m_NSRLDb;
-TSK_HDB_INFO * m_knownBadDb;
+static TSK_HDB_INFO * m_NSRLDb = NULL;
+static TSK_HDB_INFO * m_knownBadDb = NULL;
 
 /** Throw an TSK exception back up to the Java code with a specific message.
  */
@@ -251,18 +251,18 @@ JNIEXPORT void JNICALL
  */
 JNIEXPORT jint JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDBLookup
 (JNIEnv * env, jclass obj, jstring hash){
-    
+
     jboolean isCopy;
-    
+
     const char *md5 = (const char *) env->GetStringUTFChars(hash, &isCopy);
 
     TSK_AUTO_CASE_KNOWN_FILE_ENUM file_known = TSK_AUTO_CASE_FILE_KNOWN_UNKNOWN;
 
     if (m_NSRLDb != NULL) {
         int8_t retval = tsk_hdb_lookup_str(m_NSRLDb, md5, TSK_HDB_FLAG_QUICK, NULL, NULL);
-                
+
         if (retval == -1) {
-        throwTskError(env, "error matching nsrl hashset");
+            throwTskError(env);
         } else if (retval) {
             file_known = TSK_AUTO_CASE_FILE_KNOWN_KNOWN;
         }
@@ -270,15 +270,15 @@ JNIEXPORT jint JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDBLookup
 
     if (m_knownBadDb != NULL) {
         int8_t retval = tsk_hdb_lookup_str(m_knownBadDb, md5, TSK_HDB_FLAG_QUICK, NULL, NULL);
-                
+
         if (retval == -1) {
-            throwTskError(env, "error matching known bad hashset");
+            throwTskError(env);
         } else if (retval) {
             file_known = TSK_AUTO_CASE_FILE_KNOWN_BAD;
         }
     }
 
-	env->ReleaseStringUTFChars(hash, (const char *) md5);
+    env->ReleaseStringUTFChars(hash, (const char *) md5);
 
     return (int) file_known;
 }
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Hash.java b/bindings/java/src/org/sleuthkit/datamodel/Hash.java
index cb34e2e30c3d90b73f95c8724c4f1b53155cc944..78d780c91da6867a03a30d5ae14295b6cb4474f1 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Hash.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Hash.java
@@ -32,9 +32,9 @@ class Hash {
 
     /**
      * generate the md5 hash for the given content
-	 * 
-	 * @param content	Content object whose md5 hash we want to calculate
-	 * @return			md5 of the given Content object
+     * 
+     * @param content    Content object whose md5 hash we want to calculate
+     * @return            md5 of the given Content object
      */
     static String calculateMd5(Content content) {
         String hashText = "";
@@ -56,9 +56,11 @@ static String calculateMd5(Content content) {
                 hashText = "0" + hashText;
             }
         } catch (NoSuchAlgorithmException ex) {
-            logger.log(Level.SEVERE, "No algorithm known as 'md5'", ex);
+            // TODO This should be higher than INFO, but we want to avoid pop-ups during ingest.  Find better fix in future.
+            logger.log(Level.INFO, "No algorithm known as 'md5'", ex);
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Error reading content", ex);
+            // TODO This should be higher than INFO, but we want to avoid pop-ups during ingest.  Find better fix in future.
+            logger.log(Level.INFO, "Error reading content", ex);
         }
         return hashText;
     }
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index ca6651aafc29324fbe141e6f03d7fd0e37640f29..f5c407ea868dfd5ae3fb09d0e21f455c3c127bea 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -1491,9 +1491,11 @@ public String lookupFileMd5(Content cont) throws TskException{
 			updateHashAndKnown(contId, md5Hash, fileKnown);
 			return fileKnown.getName();
 		} catch (TskException ex) {
-			logger.log(Level.SEVERE, "Error looking up known status", ex);
+			// TODO This should be higher than INFO, but we want to avoid pop-ups during ingest.  Find better fix in future.
+			logger.log(Level.INFO, "Error looking up known status", ex);
 		} catch(SQLException ex) {
-			logger.log(Level.SEVERE, "Error updating SQL database", ex);
+			// TODO This should be higher than INFO, but we want to avoid pop-ups during ingest.  Find better fix in future.
+			logger.log(Level.INFO, "Error updating SQL database", ex);
 		}
 		throw new TskException("Error analyzing file");
 	}