Minor changes to clock code