Some changes to ServerWindow