A few changes to server parts