Small changes at server