Fixes for throughput controller