Fixed timeliness issues