diff --git a/checkin_notes b/checkin_notes
index b6a6dca670..d080aacb4d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9452,3 +9452,15 @@ Rom    22 July 2005
         BOINCBaseView.cpp, .h
         BOINCTaskCtrl.cpp, .h
         ViewProjects.cpp
+
+Rom    22 July 2005
+    - Fix the statistics buttons so that they show up again after the
+        wxScrollWindow conversion.
+    - Fix for wireless USB adapters so that connection request events
+        happen even when InternetGetConnectedState returns a value
+        indicating that the machine is not connected.
+
+    client/
+        net_xfer.C
+    clientgui/
+        ViewStatistics.cpp
diff --git a/client/net_xfer.C b/client/net_xfer.C
index 7ebb81ecb4..96ae07045a 100644
--- a/client/net_xfer.C
+++ b/client/net_xfer.C
@@ -94,17 +94,9 @@ int NET_XFER::open_server() {
 
     SCOPE_MSG_LOG scope_messages(log_messages, CLIENT_MSG_LOG::DEBUG_NET_XFER);
 
-#ifdef _WIN32
-    if (get_connected_state() == CONNECTED_STATE_NOT_CONNECTED) {
-        gstate.want_network_flag = true;
-        return ERR_NO_NETWORK_CONNECTION;
-    } else {
-        gstate.want_network_flag = false;
-    }
-#endif
-
     retval = resolve_hostname(hostname, ipaddr, msg);
     if (retval) {
+        gstate.want_network_flag = true;
         msg_printf(0, MSG_ERROR, "%s\n", msg);
         return retval;
     }
diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp
index 60c84f025b..c58fac85e3 100644
--- a/clientgui/ViewStatistics.cpp
+++ b/clientgui/ViewStatistics.cpp
@@ -309,6 +309,8 @@ CViewStatistics::CViewStatistics(wxNotebook* pNotebook) :
 
     SetSizer(itemFlexGridSizer);
 
+    Layout();
+
 
 	pGroup = new CTaskItemGroup( _("Tasks") );
 	m_TaskGroups.push_back( pGroup );
@@ -345,8 +347,6 @@ CViewStatistics::CViewStatistics(wxNotebook* pNotebook) :
     // Create Task Pane Items
     m_pTaskPane->UpdateControls();
 
-    Layout();
-
     UpdateSelection();
 }