client side fixes, compiles