Fixed further bugs in CloudFront implementation