Small changes in server