Simplify clocks and fix for 1.5