Xserver: fixes