Fixed Server errors