fixes for throughput