More PD-server fixes