- bit more fixing for xserver 1.16