Small changes on server