dont build network_key plugin + minor other changes