some minor changes in Server