More tuning of timing infrastructure