Server start changes