[XS] Minor fixes