diff --git a/provision-ubuntu.sh b/provision-ubuntu.sh
index 4ab296a..3a9688e 100644
--- a/provision-ubuntu.sh
+++ b/provision-ubuntu.sh
@@ -1,5 +1,4 @@
 #! /usr/bin/env sh
 apt-get install -y \
   clang \
-  libssl-dev \
-  nasm
+  yasm
diff --git a/run.py b/run.py
index 88ed99c..d11b36a 100755
--- a/run.py
+++ b/run.py
@@ -155,7 +155,6 @@ def provision():
     provision = ['sudo', 'sh', 'provision-ubuntu.sh']
     prov_proc = subprocess.run(provision)
 
-    os.environ['CC'] = 'clang'
     waf = [sys.executable, 'waf.py', 'configure']
     waf_proc = subprocess.run(waf)
 
@@ -204,14 +203,12 @@ if __name__ == '__main__':
     if args.provision:
         provision()
 
-    elif args.build:
+    if args.build:
         build()
 
-    elif args.dumps:
+    if args.dumps:
         hex_dumps(args.dir)
 
-    else:
-        with Server() as server:
-            gen = Genorator(
-                server=server, parent=args.parent, seed=args.seed,
-                run_dir=args.dir)
+    with Server() as server:
+        gen = Genorator(server=server, parent=args.parent,
+                        seed=args.seed, run_dir=args.dir)
diff --git a/wscript b/wscript
index 648d366..9ba73f3 100644
--- a/wscript
+++ b/wscript
@@ -1,15 +1,15 @@
-#! /usr/bin/env python
-# encoding: utf-8
-CC = 'clang++'
+#! /usr/bin/env python3
+# -*- mode: python -*-
+# vi: set ft=python :
 
 
 def options(opt):
-    opt.load('nasm')
+    opt.load('yasm')
     opt.load('compiler_cxx')
 
 
 def configure(conf):
-    conf.load('nasm')
+    conf.load('yasm')
     conf.load('compiler_cxx')