diff --git a/src/V3File.cpp b/src/V3File.cpp
index 1bd41944a..5e2e25e3b 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -343,7 +343,7 @@ private:
 	ssize_t sizegot = 0;
 	while (!m_readEof && (size<0 || size>sizegot)) {
 	    ssize_t todo = INFILTER_IPC_BUFSIZ;
-	    if (size>0 && size<INFILTER_IPC_BUFSIZ) todo = size;
+	    if (size>0 && size<todo) todo = size;
 	    ssize_t got = read (fd, buf, todo);
 	    //UINFO(9,"RD GOT g "<< got<<" e "<<errno<<" "<<strerror(errno)<<endl);  usleep(50*1000);
 	    if (got>0) {
diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp
index a75911280..575bcba05 100644
--- a/src/V3PreShell.cpp
+++ b/src/V3PreShell.cpp
@@ -48,9 +48,12 @@ protected:
     //---------------------------------------
     // METHODS
 
-    static int debug() {
+    static int debug(bool reset=false) {
 	static int level = -1;
-	if (VL_UNLIKELY(level < 0)) level = v3Global.opt.debugSrcLevel(__FILE__);
+	if (VL_UNLIKELY(level < 0) || reset) {
+	    level = v3Global.opt.debugSrcLevel(__FILE__);
+	    if (s_preprocp) s_preprocp->debug(debug());
+	}
 	return level;
     }
 
@@ -72,6 +75,8 @@ protected:
     }
 
     void preproc (FileLine* fl, const string& modname, V3InFilter* filterp, V3ParseImp* parsep) {
+	debug(true);  // Recheck if debug on - first check was before command line passed
+
 	// Preprocess the given module, putting output in vppFilename
 	UINFONL(1,"  Preprocessing "<<modname<<endl);