Smaller client side fixes