Could someone review #4838 and #4784? Both are small PRs with just a few lines of changes. The MCP reconnect issue in #4837 is affecting both us and another user in production. Thanks!