[Subhas] Fix Netbook-to-netbook and Netbook-to-server sync