[Fixed] Server issues