Some server tweaks + additional ADC related files