diff --git a/tsk3/base/tsk_base.h b/tsk3/base/tsk_base.h
index 8dc1ad675a73ae043284203036b98193971fa344..018fe70b9a5e4a2d0fc87e0fee502c2b93544b3e 100644
--- a/tsk3/base/tsk_base.h
+++ b/tsk3/base/tsk_base.h
@@ -306,9 +306,8 @@ extern "C" {
 #define TSK_ERR_MASK	0x00ffffff
 
 #define TSK_ERR_AUX_MALLOC	(TSK_ERR_AUX | 0)
-#define TSK_ERR_AUX_BLANK   (TSK_ERR_AUX | 1)
 #define TSK_ERR_AUX_GENERIC (TSK_ERR_AUX | 2)
-#define TSK_ERR_AUX_MAX		3
+#define TSK_ERR_AUX_MAX		2
 
 #define TSK_ERR_IMG_NOFILE	(TSK_ERR_IMG | 0)
 #define TSK_ERR_IMG_OFFSET	(TSK_ERR_IMG | 1)
diff --git a/tsk3/base/tsk_error.c b/tsk3/base/tsk_error.c
index 3f3dfa33a2dd37ea77961bc245aae10dfa9d4b4f..7758635678299f8b7f64906db5e4dfcccc149bb2 100644
--- a/tsk3/base/tsk_error.c
+++ b/tsk3/base/tsk_error.c
@@ -24,7 +24,6 @@ int tsk_verbose = 0;
 /* Error messages */
 static const char *tsk_err_aux_str[TSK_ERR_IMG_MAX] = {
     "Insufficient memory",
-    "",
     "TSK Error"
 };
 
diff --git a/tsk3/fs/tsk_fs.h b/tsk3/fs/tsk_fs.h
index 9cea8887e23500c35848e9a39f961fa3e62055c4..44b1b6e3d75a02db276f7f777a144fed0df853ff 100644
--- a/tsk3/fs/tsk_fs.h
+++ b/tsk3/fs/tsk_fs.h
@@ -235,10 +235,10 @@ extern "C" {
 
         // Types for HFS+ File Attributes
         TSK_FS_ATTR_TYPE_HFS_DEFAULT = 0x01,    // 1    Data fork of fs special files and misc
-        TSK_FS_ATTR_TYPE_HFS_DATA = 0x80,       // 128  Data and RSRC forks of regular files
-        TSK_FS_ATTR_TYPE_HFS_EXT_ATTR = 0xE0,   // 224  Extended Attributes, exc. compression records
-        TSK_FS_ATTR_TYPE_HFS_COMP_REC = 0x110,  // 272  Compression records
-        TSK_FS_ATTR_TYPE_HFS_RSRC = 0x120       // 288  Individual resources in the RSRC fork
+        TSK_FS_ATTR_TYPE_HFS_DATA = 0x1100,     // 4352 Data fork of regular files
+        TSK_FS_ATTR_TYPE_HFS_RSRC = 0x1101,     // 4353 Resource fork of regular files
+        TSK_FS_ATTR_TYPE_HFS_EXT_ATTR = 0x1102, // 4354 Extended Attributes, except compression records
+        TSK_FS_ATTR_TYPE_HFS_COMP_REC = 0x1103, // 4355 Compression records
     } TSK_FS_ATTR_TYPE_ENUM;
 
 #define TSK_FS_ATTR_ID_DEFAULT  0       ///< Default Data ID used if file system does not assign one.