Clock tweaks [3/3]