Small Rest server fixes