diff --git a/os161-container/helpers.sh b/os161-container/helpers.sh
index 06e2bbf903cc0ef376ae90c2d65f5f6a970160d2..60c8f83fe0b81825d522ba83df68b158f133faf6 100755
--- a/os161-container/helpers.sh
+++ b/os161-container/helpers.sh
@@ -46,6 +46,11 @@ build_k_helper() {
 	bmake WERROR= >> $LOGS/make.log 2>> $LOGS/make.log
 	bmake install >> $LOGS/make.log 2>> $LOGS/make.log
 
+	cd $OS161_DIR
+	echo "Building Userspace programs" >> $LOGS/make.log
+	bmake WERROR= >> $LOGS/make.log 2>> $LOGS/make.log
+	bmake install >> $LOGS/make.log 2>> $LOGS/make.log
+
 	cd /os-compile/
 	cp /sys161.conf .
 }
@@ -85,7 +90,6 @@ test_kernel() {
 		done
 	done
 	cd - > /dev/null
-	/evalaute $LOGS/test_public.log /assignments/$1
 }
 
 
diff --git a/os161-container/run_assignment.sh b/os161-container/run_assignment.sh
index 2f6f90883d8a7e71f8d3eae8a575d6013e61038b..f12b17551c5a6de6635880fe4cfe4e17d3b4e5e7 100755
--- a/os161-container/run_assignment.sh
+++ b/os161-container/run_assignment.sh
@@ -9,4 +9,4 @@ source /helpers.sh
 
 /assignments/$1/run.sh $1
 
-/evalaute $LOGS/test_public.log /assignments/$1
+PYTHONDONTWRITEBYTECODE=TRUE /evalaute $LOGS/test_public.log /assignments/$1