WIP: Fix timing issues

Open Michael Barnett-Cowan requested to merge fixTimingIssues into master

Merge request reports