Minor changes in Clock
Merge https://github.com/AndreasWelchlin/cxxtools