Fixes to the shared NetworkClock