Fix more server incompatibilities
Fix more server incompatibilities