Fix server issues