Fixed existing server issues