Fix unbind and disconnect arguments