Ported more things to XS