fix server stuff