Fixes for new _connect/_disconnect apis
Can't use interface as variable on Windows