Some minor fixs over clock