Fixed timing and WAF problems