Timing bug fixes