Fixed errors on the client side