More fixes in preparation for switching to TimeSources