Fixed errors in Client