Corrected some issues with with Clock model.