Xs build patch