Clock fixes