Review comments and Load Balancer update changes