Further TimeSync fixes