Merge "Minor bug fixes to Balancer."