Fix for #265, fix to waf validation test.