Fixed some minor client side bugs