Fixed Server issues