More fixes for FixedClock. Note to self: test more code after refactoring!