Fix cloudfront regexps in s3 input