Minor changes in Clock