fix server issues