Update to build with waf