Route53 fixes

Couple of small fixes here and there to get the code working.