Fixing the Server