Fixing server calls, part 2.