Fix some bugs in timing comms