Fix disconnect and unbind which weren't really working