More changes to improve latency