Fix proxy client bugs