Fix more server bugs.