Fix S3 and Cloudfront grunt problems