server-side fixes