diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 1047919bebebe7b2119b9d473bd7829ef442cb40..f5b47a89dfe282417b724e37ccd9fcf651a51d28 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -200,7 +200,7 @@ uint8_t
 
     return 0;
 #else
-    return openImageUtf8(a_num, a_images, a_type, a_ssize, dataSourceId);
+    return openImageUtf8(a_num, a_images, a_type, a_ssize, a_deviceId);
 #endif
 }
 
diff --git a/tsk/img/ewf.c b/tsk/img/ewf.c
index cf28cff2a3d53f86d14a2faecf24f08d5445d293..fe0b9f4dcb7eebbcf7a15c2f760b9028c569d0c9 100644
--- a/tsk/img/ewf.c
+++ b/tsk/img/ewf.c
@@ -34,9 +34,7 @@ getError(libewf_error_t * ewf_error,
     error_string[0] = '\0';
     retval = libewf_error_backtrace_sprint(ewf_error,
         error_string, TSK_EWF_ERROR_STRING_SIZE);
-    if (retval)
-        return 1;
-    return 0;
+    return retval <= 0;
 }
 #endif