Fixes for route53 and cdn