Fixes to get right update timings