Finish the adjustments on server files