Server fixes before client merge