diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index c71eed1e6dd12845c57c80fdfc66a167dfaff3d9..c25f90f28549cd6ef7bce34dc4a810f33716bbda 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -124,7 +124,7 @@ class TskAutoDb:public TskAuto {
     //internal structure to keep track of temp. unalloc block range
     typedef struct _UNALLOC_BLOCK_WLK_TRACK {
         _UNALLOC_BLOCK_WLK_TRACK(const TskAutoDb & tskAutoDb, const TSK_FS_INFO & fsInfo, const int64_t fsObjId, int64_t chunkSize)
-            : tskAutoDb(tskAutoDb),fsInfo(fsInfo),fsObjId(fsObjId),curRangeStart(0),prevBlock(0),isStart(true), chunkSize(chunkSize) {}
+            : tskAutoDb(tskAutoDb),fsInfo(fsInfo),fsObjId(fsObjId),curRangeStart(0), chunkSize(chunkSize), prevBlock(0), isStart(true) {}
         const TskAutoDb & tskAutoDb;
         const TSK_FS_INFO & fsInfo;
         const int64_t fsObjId;
diff --git a/tsk/fs/tsk_fs.h b/tsk/fs/tsk_fs.h
index 87b256e7e62b8ee80acfce9165d85a0e0624e11b..bd37e56d962b6911b9be1e135e1595ed4df7bce3 100644
--- a/tsk/fs/tsk_fs.h
+++ b/tsk/fs/tsk_fs.h
@@ -214,7 +214,9 @@ extern "C" {
 
     /**
     * These are based on the NTFS type values. 
-     * Added types for HFS+.
+    * Added types for HFS+.
+    * NOTE: Update bindings/java/src/org/sleuthkit/datamodel/TskData.java
+    * with any changes.
     */
     typedef enum {
         TSK_FS_ATTR_TYPE_NOT_FOUND = 0x00,       // 0
@@ -767,6 +769,8 @@ extern "C" {
         TSK_FS_TYPE_YAFFS2_DETECT = 0x00003000,   ///< YAFFS2 auto detection
         TSK_FS_TYPE_UNSUPP = 0xffffffff,        ///< Unsupported file system
     };
+    /* NOTE: Update bindings/java/src/org/sleuthkit/datamodel/TskData.java
+     * with any changes. */
     typedef enum TSK_FS_TYPE_ENUM TSK_FS_TYPE_ENUM;
 
     /**