desktop client and connect fixes