more minor server changes