Server compatibility cleanups