minor changes according to latest server documentation