waf: sanitize and fix added cross answer