Fix cloudfront issues
Fix cloudfront issues