s3 cdn fixes
cdn support fix