Small improvements to clock demo