Timing related tweaks are made.