Timing Fixes