Fix timing.
Merge branch 'fix-build'