Fixed Server Issues