Fixes to the xqueue and xserver roles.