client side fixes, it compiles