Fix issues with plugin and test/bootstrap disconnect