Clock tweaks [2/3]