Minor client side changes