Clocks fixes