Fix server calls in handler