- small improvments in Server implementation