diff --git a/Makefrag b/Makefrag
index 010e614e..b07bceac 100644
--- a/Makefrag
+++ b/Makefrag
@@ -2,7 +2,7 @@
 
 MODEL := Top
 CXX := g++
-CXXFLAGS := -O2 -g
+CXXFLAGS := -O2
 
 SBT := java -Xmx2048M -Xss8M -XX:MaxPermSize=128M -jar sbt-launch.jar
 
diff --git a/emulator/Makefile b/emulator/Makefile
index 484ac655..7e8f5443 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -3,8 +3,7 @@ all: emulator
 basedir = ..
 include ../Makefrag
 
-CXX := g++
-CXXFLAGS := $(CXXFLAGS) -O1 -std=c++0x -I$(RISCV)/include
+CXXFLAGS := $(CXXFLAGS) -std=c++0x -I$(RISCV)/include
 
 CXXSRCS := emulator disasm mm mm_dramsim2
 CXXFLAGS := $(CXXFLAGS) -I$(basedir)/csrc -I$(basedir)/chisel/csrc -I$(basedir)/dramsim2
@@ -75,7 +74,8 @@ output/%.out: output/%.hex emulator
 	./emulator +dramsim +max-cycles=3000000 +verbose +coremap-random +loadmem=$< none 2> $@
 
 output/%.vpd: output/%.hex emulator-debug
-	./emulator-debug +dramsim +max-cycles=3000000 +verbose -v- +coremap-random +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) | vcd2vpd - $@ > /dev/null && [ $$PIPESTATUS -eq 0 ]
+	rm -rf $@.vcd && mkfifo $@.vcd
+	./emulator-debug +dramsim +max-cycles=3000000 +verbose -v$@.vcd +coremap-random +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) | vcd2vpd $@.vcd $@ > /dev/null && [ $$PIPESTATUS -eq 0 ]
 
 run-asm-tests: $(addprefix output/, $(addsuffix .out, $(global_asm_tests) $(global_asm_vm_tests)))
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo;