Minor changes to improve latency analysis