Fix regex and paths