Client-side fixes