More server-side fixes