client side fixes