Fix issues with RPC waits happening on the wrong thread
Make timeouts more consistent for RPC