fixes for waf scripts