Various changes to get config templates working and cloud-aws