More CloudFront issues fixed