Further client.php fixes