Fix minor issues with client.go