Fix more server issues