diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp
index 9d64cf11..9f104d86 100644
--- a/libraries/app/impacted.cpp
+++ b/libraries/app/impacted.cpp
@@ -286,8 +286,8 @@ struct get_impacted_account_visitor
 
 void operation_get_impacted_accounts( const operation& op, flat_set<account_id_type>& result )
 {
-   get_impacted_account_visitor vtor = get_impacted_account_visitor( result );
-   op.visit( vtor );
+   //get_impacted_account_visitor vtor = get_impacted_account_visitor( result );
+   //op.visit( vtor );
 }
 
 void transaction_get_impacted_accounts( const transaction& tx, flat_set<account_id_type>& result )
diff --git a/libraries/plugins/peerplays_sidechain/CMakeLists.txt b/libraries/plugins/peerplays_sidechain/CMakeLists.txt
index b6e94298..10b2d7f2 100644
--- a/libraries/plugins/peerplays_sidechain/CMakeLists.txt
+++ b/libraries/plugins/peerplays_sidechain/CMakeLists.txt
@@ -8,7 +8,9 @@ add_library( peerplays_sidechain
 
 target_link_libraries( peerplays_sidechain sidechain graphene_chain graphene_app )
 target_include_directories( peerplays_sidechain
-                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/sidechain/include"
+                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/sidechain/network/include" )
 
 install( TARGETS
    peerplays_sidechain
diff --git a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
index 8851f697..4f1d60d3 100644
--- a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
+++ b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
@@ -1,6 +1,6 @@
 #include <graphene/peerplays_sidechain/peerplays_sidechain_plugin.hpp>
 
-#include <graphene/sidechain/network/sidechain_network_manager.hpp>
+#include <sidechain/network/sidechain_net_manager.hpp>
 
 namespace bpo = boost::program_options;
 
@@ -74,7 +74,7 @@ void peerplays_sidechain_plugin::plugin_initialize(const boost::program_options:
       const auto rpc_user = options.at("bitcoin-node-rpc-user").as<std::string>();
       const auto rpc_password = options.at("bitcoin-node-rpc-password").as<std::string>();
 
-      my.bitcoin_manager.initialize_manager(&database(), ip, zmq_port, rpc_port, rpc_user, rpc_password);
+      my->bitcoin_manager.initialize_manager(&database(), ip, zmq_port, rpc_port, rpc_user, rpc_password);
    } else {
       wlog("Haven't set up sidechain parameters");
    }
diff --git a/programs/witness_node/CMakeLists.txt b/programs/witness_node/CMakeLists.txt
index e43172a0..407e8e27 100644
--- a/programs/witness_node/CMakeLists.txt
+++ b/programs/witness_node/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 
 # We have to link against graphene_debug_witness because deficiency in our API infrastructure doesn't allow plugins to be fully abstracted #246
 target_link_libraries( witness_node
-                       PRIVATE graphene_app graphene_account_history graphene_affiliate_stats graphene_market_history graphene_witness graphene_chain graphene_debug_witness graphene_bookie graphene_egenesis_full fc peerplays_sidechain ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_app graphene_account_history graphene_affiliate_stats graphene_market_history graphene_witness graphene_chain graphene_debug_witness graphene_bookie graphene_egenesis_full fc peerplays_sidechain sidechain_network ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 # also add dependencies to graphene_generate_genesis graphene_generate_uia_sharedrop_genesis if you want those plugins
 
 install( TARGETS