Fixes to allow for the adding of a plugin for handing disconnect server operations