GitHub #159: Updates to synchronization in RPC to plug races