Central server fixes