Fixed a few client side errors