diff --git a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/CommunicationArtifactsHelper.java b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/CommunicationArtifactsHelper.java
index e177a2921b3511e0d71b03d60615a1445e097839..3243cbf970e2d82e3595c4d9654129152ba99c79 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/CommunicationArtifactsHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/CommunicationArtifactsHelper.java
@@ -77,7 +77,6 @@ public final class CommunicationArtifactsHelper extends ArtifactHelperBase {
 	private static final BlackboardAttribute.Type ATTACHMENTS_ATTR_TYPE = new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ATTACHMENTS);
 	private static final BlackboardArtifact.Type ASSOCIATED_OBJ_TYPE = new BlackboardArtifact.Type(BlackboardArtifact.ARTIFACT_TYPE.TSK_ASSOCIATED_OBJECT);
 
-	
 	/**
 	 * Enum for message read status
 	 */
@@ -153,7 +152,7 @@ public String getDisplayName() {
 	 * application account and a device account should be used instead.
 	 *
 	 * NOTE: This constructor should not be used when using transactions.
-	 * 
+	 *
 	 * @param caseDb       The case database.
 	 * @param moduleName   The name of the module creating the artifacts.
 	 * @param srcContent   The source/parent content of the artifacts.
@@ -942,7 +941,7 @@ public BlackboardArtifact addCalllog(CommunicationDirection direction,
 		BlackboardArtifact callLogArt = null;
 		CaseDbTransaction transaction = getSleuthkitCase().beginTransaction();
 		try {
-			callLogArt = addCalllog(direction, callerId, calleeIdsList, startDateTime, endDateTime, mediaType, otherAttributesList, transaction);
+			callLogArt = addCalllog(direction, callerId, calleeIdsList, startDateTime, endDateTime, mediaType, transaction, otherAttributesList);
 			transaction.commit();
 		} catch (TskCoreException | BlackboardException ex) {
 			transaction.rollback();
@@ -974,6 +973,7 @@ public BlackboardArtifact addCalllog(CommunicationDirection direction,
 	 * @param startDateTime       Start date/time, 0 if not available.
 	 * @param endDateTime         End date/time, 0 if not available.
 	 * @param mediaType           Call media type, UNKNOWN if not available.
+	 * @param trans               The case database transaction.
 	 * @param otherAttributesList other attributes, can be an empty list
 	 *
 	 * @return Call log artifact.
@@ -986,8 +986,8 @@ public BlackboardArtifact addCalllog(CommunicationDirection direction,
 			Collection<String> calleeIdsList,
 			long startDateTime, long endDateTime,
 			CallMediaType mediaType,
-			Collection<BlackboardAttribute> otherAttributesList,
-			CaseDbTransaction trans) throws TskCoreException, BlackboardException {
+			CaseDbTransaction trans,
+			Collection<BlackboardAttribute> otherAttributesList) throws TskCoreException, BlackboardException {
 
 		// Either caller id or a callee id must be provided.
 		if (StringUtils.isEmpty(callerId) && (isEffectivelyEmpty(calleeIdsList))) {
@@ -1125,7 +1125,7 @@ public void addAttachments(BlackboardArtifact message, MessageAttachments attach
 					}
 				}
 			}
-			
+
 			// if null, substitute 0
 			dataSourceObjId = dataSourceObjId == null ? 0L : dataSourceObjId;
 			attachmentArts = addAttachments(message, dataSourceObjId, attachments, getModuleName(), transaction);
@@ -1148,10 +1148,9 @@ public void addAttachments(BlackboardArtifact message, MessageAttachments attach
 		}
 	}
 
-	
 	/**
-	 * Adds attachments to a message. 
-	 * 
+	 * Adds attachments to a message.
+	 *
 	 * NOTE: Does not post the created artifacts.
 	 *
 	 * @param message         Message artifact.
@@ -1211,7 +1210,7 @@ private DataArtifact associateAttachmentWithMessage(BlackboardArtifact message,
 				null,
 				transaction);
 	}
-	
+
 	/**
 	 * Converts a list of ids into a single comma separated string.
 	 */
diff --git a/tsk/fs/logical_fs.cpp b/tsk/fs/logical_fs.cpp
index 68c98b1c2a22503a02fc748e0374c31171956aa1..897c465645545187f421045d5e894de477ca5c30 100644
--- a/tsk/fs/logical_fs.cpp
+++ b/tsk/fs/logical_fs.cpp
@@ -321,7 +321,7 @@ TSK_TCHAR * create_search_path_long_path(const TSK_TCHAR *base_path) {
 	return searchPath;
 #else
 	// Nothing to do here if it's not Windows
-	return null;
+	return NULL;
 #endif
 }