More client side bug fixes