Small changes to server