diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 5a18eed2..214bed9c 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -18,7 +18,6 @@
 
 #include "../Platform.h"
 #include <shlobj.h>
-#include <shellapi.h>
 #include "resource.h"
 #include "util.h"
 #include "fileform.h"
diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index ed56bc06..5de07ae1 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -18,7 +18,6 @@
 
 #include "../Platform.h"
 #include <shlobj.h>
-#include <shellapi.h>
 #include "fileform.h"
 #include "util.h"
 #include "state.h"
diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h
index ffb5fa45..fe652cb8 100644
--- a/Source/exehead/fileform.h
+++ b/Source/exehead/fileform.h
@@ -28,6 +28,7 @@
 // firstheader (struct firstheader)
 // * headers (compressed together):
 //   header (struct header - contains pointers to all blocks)
+//   * nsis blocks (described in header->blocks)
 //     pages (struct page)
 //     section headers (struct section)
 //     entries/instructions (struct entry)
diff --git a/Source/script.cpp b/Source/script.cpp
index af32954f..3bf2ee77 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -5252,6 +5252,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
         }
         if (which_token == TOK_WRITEREGBIN)
         {
+          // Jim Park: Keep the data as char / 8 bits
           char data[3*NSIS_MAX_STRLEN];
           TCHAR *p=line.gettoken_str(4);
           int data_len=0;