Revamping so waf building works again