More timeline clock fixes