Fix of issues related to plocal server support.