Fix clock initialization

This seems to break some tests. @daithiocrualaoich Could you have a look?