Fixes to remove ambiguity in Clock