[master] Two more for the NTP/time code