Add timeouts to RPC calls