More adjustments to new server infrastructure