Fixed client side bugs.