Fixes to timing and reporting BW