Timing logic fixes (work in progress)