Some tweaks around retrying & timeouts. Addeed realtime updates.