Turned O3 back on.
Some timing cleanup.