Tweaks for clock typedef