contrib & lib: fix other clients of clock