diff --git a/driver/Makefile b/driver/Makefile
index a6a80c6..5ca38f8 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,13 +1,6 @@
 
 dtracedrv-objs := \
-	ctf_hash.o \
-	ctf_lookup.o \
-	ctf_mod.o \
-	ctf_open.o \
-	ctf_struct.o \
-	ctf_subr.o \
-	ctf_types.o \
-	ctf_util.o \
+	../libctf.a \
 	ctl.o \
 	cpu_x86.o \
 	cyclic_linux.o \
@@ -39,7 +32,6 @@ dtracedrv-objs := \
 	tcp.o \
 	toxic.o \
 	instr_size.o \
-	uncompress.o \
 	vminfo.o \
 	x_call.o
 ifdef BUILD_i386
diff --git a/driver/mutex.c b/driver/mutex.c
index a5381da..ba8b0cf 100644
--- a/driver/mutex.c
+++ b/driver/mutex.c
@@ -45,11 +45,8 @@ static const int disable_ints;
 void
 dmutex_init(mutex_t *mp)
 {
-static DEFINE_SEMAPHORE(null_sema);
-
 	memset(mp, 0, sizeof *mp);
-	mp->m_sem = null_sema;
-//	sema_init(&mp->m_sem, 1);
+	sema_init(&mp->m_sem, 1);
 	mp->m_initted = TRUE;
 }
 
diff --git a/libdtrace/makefile b/libdtrace/makefile
index b51c39b..d936e0e 100644
--- a/libdtrace/makefile
+++ b/libdtrace/makefile
@@ -79,9 +79,9 @@ $(LIB): \
 	$(LIB)(stubs.o)
 
 dt_errtags.c: dt_errtags.h mkerrtags.sh
-	mkerrtags.sh <dt_errtags.h > dt_errtags.c
+	./mkerrtags.sh <dt_errtags.h > dt_errtags.c
 dt_names.c: mknames.sh
-	mknames.sh <../../uts/common/sys/dtrace.h | sed -e 's/\\n/\n/g' > dt_names.c
+	./mknames.sh <../../uts/common/sys/dtrace.h | sed -e 's/\\n/\n/g' > dt_names.c
 
 $(BINDIR)/dt_grammar.h $(LIB)(dt_grammar.o): dt_grammar.y $(H) 
 	../tools/yacc.pl -d dt_grammar.y