Various Clock fixes; see individual commits