Some Balancer improvements for performance and compatibility