8 files changed, 9 insertions, 15 deletions
diff --git a/gr-blocks/grc/blks2_error_rate.xml b/gr-blocks/grc/blks2_error_rate.xml
index 8be018243f..c71739f914 100644
--- a/gr-blocks/grc/blks2_error_rate.xml
+++ b/gr-blocks/grc/blks2_error_rate.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>Error Rate</name>
 	<key>blks2_error_rate</key>
-	<category>Deprecated</category>
+	<category>[Core]/Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.error_rate(
 	type=$type,
diff --git a/gr-blocks/grc/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
index 580fdd9d8c..3442b2cdb8 100644
--- a/gr-blocks/grc/blks2_selector.xml
+++ b/gr-blocks/grc/blks2_selector.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>Selector</name>
 	<key>blks2_selector</key>
-	<category>Deprecated</category>
+	<category>[Core]/Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.selector(
 	item_size=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
index 46b10a7790..2bff7e6d45 100644
--- a/gr-blocks/grc/blks2_tcp_sink.xml
+++ b/gr-blocks/grc/blks2_tcp_sink.xml
@@ -7,7 +7,7 @@
 <block>
 	<name>TCP Sink</name>
 	<key>blks2_tcp_sink</key>
-	<category>Deprecated</category>
+	<category>[Core]/Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.tcp_sink(
 	itemsize=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_tcp_source.xml b/gr-blocks/grc/blks2_tcp_source.xml
index 6a59522f3f..f6cc41015f 100644
--- a/gr-blocks/grc/blks2_tcp_source.xml
+++ b/gr-blocks/grc/blks2_tcp_source.xml
@@ -7,7 +7,7 @@
 <block>
 	<name>TCP Source</name>
 	<key>blks2_tcp_source</key>
-	<category>Deprecated</category>
+	<category>[Core]/Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.tcp_source(
 	itemsize=$type.size*$vlen,
diff --git a/gr-blocks/grc/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
index d879ff655f..c3f25163b2 100644
--- a/gr-blocks/grc/blks2_valve.xml
+++ b/gr-blocks/grc/blks2_valve.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>Valve</name>
 	<key>blks2_valve</key>
-	<category>Deprecated</category>
+	<category>[Core]/Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.valve(item_size=$type.size*$vlen, open=bool($open))</make>
 	<callback>set_open(bool($open))</callback>
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index bfab41aeb6..a9441a9ffb 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -27,7 +27,7 @@
 ###################################################
  -->
 <cat>
-   <name></name> <!-- Blank for Root Name -->
+   <name>[Core]</name>
    <cat>
       <name>Audio</name>
       <block>blocks_wavfile_source</block>
@@ -144,6 +144,8 @@
       <block>blocks_null_sink</block>
       <block>blocks_copy</block>
       <block>blocks_nop</block>
+      <block>xmlrpc_server</block>
+      <block>xmlrpc_client</block>
    </cat>
    <cat>
       <name>Modulators</name>
@@ -230,9 +232,4 @@
       <name>Variables</name>
       <block>variable_tag_object</block>
    </cat>
-   <cat>
-      <name>Misc</name>
-      <block>xmlrpc_server</block>
-      <block>xmlrpc_client</block>
-   </cat>
 </cat>
diff --git a/gr-blocks/lib/ConfigChecks.cmake b/gr-blocks/lib/ConfigChecks.cmake
index 7f60aed403..1effaa8360 100644
--- a/gr-blocks/lib/ConfigChecks.cmake
+++ b/gr-blocks/lib/ConfigChecks.cmake
@@ -56,7 +56,7 @@ CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H)
 IF(HAVE_WINDOWS_H)
     ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK)
     MESSAGE(STATUS "Adding windows libs to gr blocks libs...")
-    LIST(APPEND blocks_libs WS2_32.lib WSock32.lib)
+    LIST(APPEND blocks_libs ws2_32 wsock32)
 ENDIF(HAVE_WINDOWS_H)
 
 ########################################################################
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc
index d1d3b45827..ea2f2b60a0 100644
--- a/gr-blocks/lib/udp_source_impl.cc
+++ b/gr-blocks/lib/udp_source_impl.cc
@@ -95,9 +95,6 @@ namespace gr {
         d_socket = new boost::asio::ip::udp::socket(d_io_service);
         d_socket->open(d_endpoint.protocol());
 
-        boost::asio::socket_base::linger loption(true, 0);
-        d_socket->set_option(loption);
-
         boost::asio::socket_base::reuse_address roption(true);
         d_socket->set_option(roption);