Fix more faulty clients
Small tweaks to socket