Final fixes for the timing update