added server fixes