Carry over some fixes from reference arch to cloudformation template