Small tweaks to 'Clock' functions