[FIX] Minor client side fixes