Fix multiple clocks, and narrow status