Fix target regex and wfsdelay
Land #2016 - Fix target regex and wfsdelay