diff --git a/part3_pointer_aware_data_flow_analysis/DivZero/test/Makefile b/part3_pointer_aware_data_flow_analysis/DivZero/test/Makefile
index 33d093c..eaf87cf 100644
--- a/part3_pointer_aware_data_flow_analysis/DivZero/test/Makefile
+++ b/part3_pointer_aware_data_flow_analysis/DivZero/test/Makefile
@@ -6,7 +6,7 @@ all: simple0.out simple1.out branch0.out branch1.out branch2.out branch3.out bra
 	clang -emit-llvm -S -fno-discard-value-names -Xclang -disable-O0-optnone -c -o $@ $<
 
 %.out: %.opt.ll
-	opt -load ../build/DataflowPass.so -DivZero $< -disable-output > $@ 2> $*.err
+	opt -load ../../build/DivZero/libDataflowPass.so -DivZero $< -disable-output > $@ 2> $*.err
 
 clean:
 	rm -f *.ll *.out *.err
diff --git a/part4_instrumentation/DivZeroInstrument/test/Makefile b/part4_instrumentation/DivZeroInstrument/test/Makefile
index bb73669..ddcc859 100644
--- a/part4_instrumentation/DivZeroInstrument/test/Makefile
+++ b/part4_instrumentation/DivZeroInstrument/test/Makefile
@@ -1,11 +1,11 @@
-TARGETS=simple0 simple1 simple2 simple3 simple4 simple5 simple6 simple7 simple8 simple9
+TARGETS=calc simple0 simple1 simple2 simple3 simple4 simple5 simple6 simple7 simple8 simple9
 
 all: ${TARGETS}
 
 %: %.c
 	clang -emit-llvm -S -fno-discard-value-names -c -o $@.ll $< -g
-	opt -load ../build/InstrumentPass.so -Instrument -S $@.ll -o $@.instrumented.ll
-	clang -o $@ -L${PWD}/../build -lruntime $@.instrumented.ll
+	opt -load ../../build/DivZeroInstrument/libInstrumentPass.so -Instrument -S $@.ll -o $@.instrumented.ll
+	clang -o $@ -L${PWD}/../../build/DivZeroInstrument -lruntime $@.instrumented.ll
 
 clean:
 	rm -f *.ll *.cov ${TARGETS}